projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
autoupdate
[gnulib.git]
/
lib
/
strdup.c
diff --git
a/lib/strdup.c
b/lib/strdup.c
index
e852934
..
bbb69e3
100644
(file)
--- a/
lib/strdup.c
+++ b/
lib/strdup.c
@@
-1,43
+1,41
@@
-/* Copyright (C) 1991, 1996, 1997, 1998, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004, 2006, 2007, 2009,
+ 2010 Free Software Foundation, Inc.
+
This file is part of the GNU C Library.
This file is part of the GNU C Library.
- Th
e GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
-
version 2.1 of the License, or (at your option)
any later version.
+ Th
is 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.
- Th
e GNU C Library
is distributed in the hope that it will be useful,
+ Th
is program
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU
-
Lesser
General Public License for more details.
+ 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 Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#if
HAVE_CONFIG_H
+#if
ndef _LIBC
# include <config.h>
#endif
# include <config.h>
#endif
-#if defined _LIBC || defined STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *malloc ();
-char *memcpy ();
-#endif
+/* Get specification. */
+#include <string.h>
+
+#include <stdlib.h>
#undef __strdup
#undef __strdup
-#undef strdup
+#ifdef _LIBC
+# undef strdup
+#endif
#ifndef weak_alias
# define __strdup strdup
#endif
#ifndef weak_alias
# define __strdup strdup
#endif
-/* Duplicate S, returning an identical malloc'd string.
- Return NULL if out of memory. */
-
+/* Duplicate S, returning an identical malloc'd string. */
char *
__strdup (const char *s)
{
char *
__strdup (const char *s)
{