From: Bruno Haible <bruno@clisp.org>
Date: Thu, 12 Oct 2000 21:26:25 +0000 (+0000)
Subject: Fix memcpy for systems which have only bcopy.
X-Git-Tag: v0.10.36~220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb04cf55b08a583d8c1edbe5a2d3ece307a1d909;p=thirdparty%2Fgettext.git

Fix memcpy for systems which have only bcopy.
---

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 5848f0822..c315aa372 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,13 @@
+2000-10-12  Bruno Haible  <haible@clisp.cons.org>
+
+	* localealias.c (memcpy): Return first argument, just like the real
+	memcpy function does.
+	* bindtextdom.c (memcpy): Likewise.
+	* finddomain.c (memcpy): Likewise.
+	* l10nflist.c (memcpy): Likewise.
+	* textdomain.c (memcpy): Likewise.
+	From Paul Eggert <eggert@twinsun.com>.
+
 2000-09-29  Bruno Haible  <haible@clisp.cons.org>
 
 	* libintl.glibc: Update from current glibc version.
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index f92117708..14e633b0e 100644
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -34,7 +34,7 @@ void free ();
 #else
 # include <strings.h>
 # ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
 # endif
 #endif
 
diff --git a/intl/finddomain.c b/intl/finddomain.c
index 2c3ca4d5b..3f8e84d67 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -40,7 +40,7 @@ void free ();
 #else
 # include <strings.h>
 # ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
 # endif
 #endif
 
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 5e538a924..2a946e364 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -32,7 +32,7 @@
 #else
 # include <strings.h>
 # ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
 # endif
 #endif
 #if !HAVE_STRCHR && !defined _LIBC
diff --git a/intl/localealias.c b/intl/localealias.c
index 0279be520..c103a048d 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -63,7 +63,7 @@ void free ();
 #else
 # include <strings.h>
 # ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
 # endif
 #endif
 #if !HAVE_STRCHR && !defined _LIBC
diff --git a/intl/textdomain.c b/intl/textdomain.c
index da278b946..302554d2f 100644
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -28,7 +28,7 @@
 #else
 # include <strings.h>
 # ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
 # endif
 #endif