Fix memcpy for systems which have only bcopy.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 5848f082234d32f093bf419520f8c589e755e5a9..c315aa372795b1e071a72fe6844ecead3909dad0 100644 (file)
--- 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 f921177086cb5e800ad9fbb422dbe704faef9053..14e633b0e7fdc99c8d9b128140696d681f5b64f1 100644 (file)
--- 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 2c3ca4d5b4c61a323b861dbcf2a1e241ceb4340d..3f8e84d6723a5a47d6b715a0fcd71473c3524c46 100644 (file)
--- 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 5e538a924ce28b28f66e19c6c516b206d3891095..2a946e3647bc4f84f72604b2cb5006b231825231 100644 (file)
--- 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 0279be520f2c53110d060c179dc8ab20b1ba4c1c..c103a048d9a5ad786dc4aa0581bdcfc007d9ab43 100644 (file)
--- 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 da278b946e45baaf30f0f785b4b823fad2bcfc7d..302554d2f21a099313e9b01e5851866c0479b913 100644 (file)
--- 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