From 23691ab23b6e631ae0c5cf58455cca25a0058e22 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 13 Jan 2007 21:31:45 +0000 Subject: [PATCH] * include/string.h: Only redefine strndupa if this is really for libc code. --- ChangeLog | 5 +++++ include/string.h | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d35ac4..9551c4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-13 Ulrich Drepper + + * include/string.h: Only redefine strndupa if this is really for + libc code. + 2007-01-12 Ulrich Drepper * nscd/nscd_gethst_r.c: Minor cleanups. diff --git a/include/string.h b/include/string.h index c196007..f73bbf9 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) -- 2.7.4