gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / lib / memcpy.c

diff --git a/lib/memcpy.c b/lib/memcpy.c
index aec71e3..2a588c2 100644 (file)
--- a/lib/memcpy.c
+++ b/lib/memcpy.c
@@ -1,29 +1,36 @@
-/* Copy LEN bytes starting at SRCADDR to DESTADDR.  Result undefined
-   if the source overlaps with the destination.
-   Return DESTADDR. */
+/* Copyright (C) 1995, 1997, 2000, 2003, 2006, 2009-2013 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <assert.h>
+/* Written by Jim Meyering <meyering@na-net.ornl.gov>.  */
 
-/* FIXME: uncomment the following for releases.  */
-#define NDEBUG 1
+#include <config.h>
 
-#ifndef ABS
-# define ABS(x) ((x) < 0 ? (-(x)) : (x))
-#endif
+#include <stddef.h>
 
-char *
-memcpy (destaddr, srcaddr, len)
-     char *destaddr;
-     const char *srcaddr;
-     int len;
+/* Copy LEN bytes starting at SRCADDR to DESTADDR.  Result undefined
+   if the source overlaps with the destination.
+   Return DESTADDR. */
+
+void *
+memcpy (void *destaddr, void const *srcaddr, size_t len)
 {
   char *dest = destaddr;
-
-  assert (len >= 0);
-  /* Make sure they don't overlap.  */
-  assert (ABS (destaddr - srcaddr) >= len);
+  char const *src = srcaddr;
 
   while (len-- > 0)
-    *destaddr++ = *srcaddr++;
-  return dest;
+    *dest++ = *src++;
+  return destaddr;
 }