diff options
-rw-r--r-- | lib/ChangeLog | 9 | ||||
-rw-r--r-- | lib/strndup.c | 4 |
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 |