* include/string.h: Only redefine strndupa if this is really for

	libc code.

diff --git a/ChangeLog b/ChangeLog
index 9d35ac4dae8fc21a4cf8e469a58aaeeef73239fe..9551c4e704cb70da3841556ecd0e55909c89fb9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-13  Ulrich Drepper  <drepper@redhat.com>
+
+       * include/string.h: Only redefine strndupa if this is really for
+       libc code.
+
 2007-01-12  Ulrich Drepper  <drepper@redhat.com>
 
        * nscd/nscd_gethst_r.c: Minor cleanups.

diff --git a/include/string.h b/include/string.h
index c196007dcb04339ab2498ebdccfe84a2e9ddd01d..f73bbf9f43ada3c6c76c5c9fe1250890184a8ec0 100644 (file)
--- a/include/string.h
+++ b/include/string.h
@@ -54,8 +54,9 @@ extern __typeof (strcasecmp_l) __strcasecmp_l;
 extern __typeof (strncasecmp_l) __strncasecmp_l;
 
 /* Alternative version which doesn't pollute glibc's namespace.  */
-#undef strndupa
-#define strndupa(s, n)                                                       \
+#ifndef NOT_IN_libc
+# undef strndupa
+# define strndupa(s, n)                                                              \
   (__extension__                                                             \
     ({                                                                       \
       __const char *__old = (s);                                             \
@@ -64,6 +65,7 @@ extern __typeof (strncasecmp_l) __strncasecmp_l;
       __new[__len] = '\0';                                                   \
       (char *) memcpy (__new, __old, __len);                                 \
     }))
+#endif
 
 libc_hidden_proto (__mempcpy)
 libc_hidden_proto (__stpcpy)