X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fstrdup.c;h=98a2655bf219a51381b64dfa0502fdde7fa64271;hb=7ef852ba849ac1fc4bef6d48e47e2dd3c0914feb;hp=8c88e310a5bf8722480ad2eb66e9d7ed6efbcb5a;hpb=3c6f894a6eb03f5119d7d3aa855c554ab10a8f4b;p=gnulib.git

diff --git a/lib/strdup.c b/lib/strdup.c
index 8c88e310a..98a2655bf 100644
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004 Free Software
+/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2011 Free Software
    Foundation, Inc.
 
    This file is part of the GNU C Library.
@@ -15,22 +15,21 @@
 
    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.  */
 
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
 # include <config.h>
 #endif
 
-#ifndef _LIBC
 /* Get specification.  */
-# include "strdup.h"
-#endif
+#include <string.h>
 
 #include <stdlib.h>
-#include <string.h>
 
 #undef __strdup
-#undef strdup
+#ifdef _LIBC
+# undef strdup
+#endif
 
 #ifndef weak_alias
 # define __strdup strdup