From: Jim Meyering <jim@meyering.net>
Date: Sat, 10 Jun 2006 09:10:12 +0000 (+0000)
Subject: Apply this change from gnulib:
X-Git-Tag: v6.0~315
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=949ed19da0421274da727b1c1eb4d66e69520f0c;p=thirdparty%2Fcoreutils.git

Apply this change from gnulib:

2006-05-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
	    Bruno Haible  <bruno@clisp.org>

* strndup.c (strndup) [!_LIBC]: Don't undefine macro definition.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 42c19cbe32..a87c9a1d19 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-10  Jim Meyering  <jim@meyering.net>
+
+	Apply this change from gnulib:
+
+	2006-05-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+	            Bruno Haible  <bruno@clisp.org>
+
+	* strndup.c (strndup) [!_LIBC]: Don't undefine macro definition.
+
 2006-06-04  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* regexec.c (group_nodes_into_DFAstates): Fix a buffer overrun
diff --git a/lib/strndup.c b/lib/strndup.c
index 932a83e4c7..2626373f26 100644
--- a/lib/strndup.c
+++ b/lib/strndup.c
@@ -36,7 +36,9 @@
 #endif
 
 #undef __strndup
-#undef strndup
+#if _LIBC
+# undef strndup
+#endif
 
 #ifndef weak_alias
 # define __strndup strndup