Update 'memmove' and 'memset' modules from gnulib.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 1279c8e8d46a818f892aca9eefbd0140b1ef1509..b48431d82afabda2044c1a0645ea858ecead5996 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -97,6 +97,11 @@
        * mbswidth.h: Add extern "C" for C++.
        Reported by Albert Chin-A-Young <china@thewrittenword.com>.
 
+2003-09-09  Paul Eggert  <eggert@twinsun.com>
+
+       * memmove.c, memset.c: Include <stddef.h>.
+       Use types required by C89 in prototype.
+
 2003-09-08  Paul Eggert  <eggert@twinsun.com>
 
        * atexit.c (atexit): Define using a prototype.

diff --git a/gettext-tools/lib/memmove.c b/gettext-tools/lib/memmove.c
index 5d4af5d7481352ebc282abaef35df11b1a892a09..79cc7827396c0ffbe75e932f8b9d93a27994b6e1 100644 (file)
--- a/gettext-tools/lib/memmove.c
+++ b/gettext-tools/lib/memmove.c
@@ -7,10 +7,13 @@
 # include <config.h>
 #endif
 
+#include <stddef.h>
+
 void *
-memmove (char *dest, const char *source, unsigned length)
+memmove (void *dest0, void const *source0, size_t length)
 {
-  char *d0 = dest;
+  char *dest = dest0;
+  char const *source = source0;
   if (source < dest)
     /* Moving from low mem to hi mem; start at end.  */
     for (source += length, dest += length; length; --length)
@@ -21,5 +24,5 @@ memmove (char *dest, const char *source, unsigned length)
       for (; length; --length)
        *dest++ = *source++;
     }
-  return (void *) d0;
+  return dest0;
 }

diff --git a/gettext-tools/lib/memset.c b/gettext-tools/lib/memset.c
index 5744bcbf7585dde15683be2084be2255657e9989..d7321b200e91d5cb4ad12935f2afc50fd52e4518 100644 (file)
--- a/gettext-tools/lib/memset.c
+++ b/gettext-tools/lib/memset.c
@@ -1,5 +1,5 @@
 /* memset.c -- set an area of memory to a given value
-   Copyright (C) 1991 Free Software Foundation, Inc.
+   Copyright (C) 1991, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,8 +15,10 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-char *
-memset (char *str, int c, unsigned int len)
+#include <stddef.h>
+
+void *
+memset (void *str, int c, size_t len)
 {
   register char *st = str;