Update from gnulib.

diff --git a/gettext-tools/libgrep/ChangeLog b/gettext-tools/libgrep/ChangeLog
index 9844494ed88f0278aa6f2ccc1cc3a69c84805e2c..ada58e6916b96e2293af2bc656ac9065a9180e87 100644 (file)
--- a/gettext-tools/libgrep/ChangeLog
+++ b/gettext-tools/libgrep/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-10  Bruno Haible  <bruno@clisp.org>
+
+       Make it possible to #define stpcpy, strdup to aliases.
+       * strdup.c (strdup) [!_LIBC]: Don't undefine.
+
 2006-09-13  Paul Eggert  <eggert@cs.ucla.edu>
 
        * memchr.c: Include <config.h> unconditionally.

diff --git a/gettext-tools/libgrep/strdup.c b/gettext-tools/libgrep/strdup.c
index 7cff51be098deb0b5cc87f365356fb2ad0ba6574..17d40d622d8643198404668bf51d17297bd89b61 100644 (file)
--- a/gettext-tools/libgrep/strdup.c
+++ b/gettext-tools/libgrep/strdup.c
@@ -27,7 +27,9 @@
 #include <string.h>
 
 #undef __strdup
-#undef strdup
+#ifdef _LIBC
+# undef strdup
+#endif
 
 #ifndef weak_alias
 # define __strdup strdup