summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2006-06-10 09:10:12 +0000
committerJim Meyering <jim@meyering.net>2006-06-10 09:10:12 +0000
commit949ed19da0421274da727b1c1eb4d66e69520f0c (patch)
tree2eac110f87b130bc0e49b4646094de3adad7e1ed /lib
parenta8ee9bcfb33a47600b2a5edb9a277fde1739ce7e (diff)
downloadcoreutils-949ed19da0421274da727b1c1eb4d66e69520f0c.tar.xz
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/ChangeLog9
-rw-r--r--lib/strndup.c4
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 42c19cbe3..a87c9a1d1 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 932a83e4c..2626373f2 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