NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...

[gnulib.git] / lib / memmove.c

diff --git a/lib/memmove.c b/lib/memmove.c
index d7bdd7c..0f04054 100644 (file)
--- a/lib/memmove.c
+++ b/lib/memmove.c
@@ -3,22 +3,24 @@
    In the public domain.
    By David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
-void
-memmove (dest, source, length)
-     char *dest;
-     const char *source;
-     unsigned length;
+#include <stddef.h>
+
+void *
+memmove (void *dest0, void const *source0, size_t length)
 {
+  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)
       *--dest = *--source;
   else if (source != dest)
-    /* Moving from hi mem to low mem; start at beginning.  */
-    for (; length; --length)
-      *dest++ = *source++;
+    {
+      /* Moving from hi mem to low mem; start at beginning.  */
+      for (; length; --length)
+        *dest++ = *source++;
+    }
+  return dest0;
 }