summaryrefslogtreecommitdiff
path: root/include/string.h
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-01-17 10:42:43 +0000
committerJakub Jelinek <jakub@redhat.com>2007-01-17 10:42:43 +0000
commitaf98d46f5a025ae33c60ddb1a5edc753fb714bc5 (patch)
tree24a3c5cb0bfc6163b52ae74ac205f0e175beee87 /include/string.h
parent1f09da09fed864c91288ff91295114fa5202edaa (diff)
Updated to fedora-glibc-20070117T0857
Diffstat (limited to 'include/string.h')
-rw-r--r--include/string.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/string.h b/include/string.h
index c196007dcb..f73bbf9f43 100644
--- 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)