X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrdup.c;h=bbb69e352feb807e5c709084450119fd698c7765;hb=89b39efd31cd0ffdaf05c9785c1af1e479728472;hp=06260fa033e70038e789688d7e0873929921053d;hpb=b747607866185b6db29c21c9b7f368c8b14e794f;p=gnulib.git

diff --git a/lib/strdup.c b/lib/strdup.c
index 06260fa03..bbb69e352 100644
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -1,4 +1,6 @@
-/* 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 program is free software; you can redistribute it and/or modify
@@ -13,30 +15,27 @@
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifndef _LIBC
 # 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
+#ifdef _LIBC
+# undef 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)
 {