projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mbslen: Avoid collision with system function.
[gnulib.git]
/
lib
/
memcpy.c
diff --git
a/lib/memcpy.c
b/lib/memcpy.c
index
b26d6a4
..
2d87e5d
100644
(file)
--- a/
lib/memcpy.c
+++ b/
lib/memcpy.c
@@
-1,9
+1,10
@@
-/* Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1997, 2000, 2003, 2006, 2009-2010 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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-11,28
+12,25
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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 <http://www.gnu.org/licenses/>. */
/* Written by Jim Meyering <meyering@na-net.ornl.gov>. */
/* Written by Jim Meyering <meyering@na-net.ornl.gov>. */
-#i
f HAVE_CONFIG_H
-# include <config.h>
-#
endif
+#i
nclude <config.h>
+
+#
include <stddef.h>
/* Copy LEN bytes starting at SRCADDR to DESTADDR. Result undefined
if the source overlaps with the destination.
Return DESTADDR. */
/* Copy LEN bytes starting at SRCADDR to DESTADDR. Result undefined
if the source overlaps with the destination.
Return DESTADDR. */
-char *
-memcpy (destaddr, srcaddr, len)
- char *destaddr;
- const char *srcaddr;
- int len;
+void *
+memcpy (void *destaddr, void const *srcaddr, size_t len)
{
char *dest = destaddr;
{
char *dest = destaddr;
+ char const *src = srcaddr;
while (len-- > 0)
while (len-- > 0)
- *dest
addr++ = *srcaddr
++;
- return dest;
+ *dest
++ = *src
++;
+ return dest
addr
;
}
}