X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fmemcpy.c;h=8d014fee7c91170dcb0725bf07de517e1c4a6703;hb=0b3b74d5643737f6e78f93a40f34462baee64131;hp=2ccd71875924967640de05ea78fdb154a0a181a7;hpb=cada80c39eb8e6b19f36d6e02839b935b5dcab33;p=gnulib.git
diff --git a/lib/memcpy.c b/lib/memcpy.c
index 2ccd71875..8d014fee7 100644
--- a/lib/memcpy.c
+++ b/lib/memcpy.c
@@ -1,9 +1,10 @@
-/* Copyright (C) 1995, 1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1997, 2000, 2003, 2006, 2009-2011 Free Software
+ * Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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 2, or (at your option)
- any later version.
+ 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
@@ -11,25 +12,25 @@
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, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by Jim Meyering . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
+
+#include
/* Copy LEN bytes starting at SRCADDR to DESTADDR. Result undefined
if the source overlaps with the destination.
Return DESTADDR. */
-char *
-memcpy (char *destaddr, const char *srcaddr, int len)
+void *
+memcpy (void *destaddr, void const *srcaddr, size_t len)
{
char *dest = destaddr;
+ char const *src = srcaddr;
while (len-- > 0)
- *destaddr++ = *srcaddr++;
- return dest;
+ *dest++ = *src++;
+ return destaddr;
}