Mercurial > hg > octave-nkf > gnulib-hg
changeset 7983:db3170662582
Sync from Libtool.
* lib/argz.c: Do not include strings.h nor memory.h, include
string.h unconditionally. Patch by Simon Josefsson.
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> |
|---|---|
| date | Sat, 27 Jan 2007 16:49:19 +0000 |
| parents | 6b61aba76343 |
| children | 4838dd1f5dd8 |
| files | ChangeLog lib/argz.c |
| diffstat | 2 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + Sync from Libtool. + * lib/argz.c: Do not include strings.h nor memory.h, include + string.h unconditionally. Patch by Simon Josefsson. + 2007-01-27 Bruno Haible <bruno@clisp.org> * m4/string_h.m4 (gl_HEADER_STRING_H_DEFAULTS): New macro, extracted
--- a/lib/argz.c +++ b/lib/argz.c @@ -32,15 +32,7 @@ #include <stdlib.h> #include <sys/types.h> #include <errno.h> - -#if defined(HAVE_STRING_H) -# include <string.h> -#elif defined(HAVE_STRINGS_H) -# include <strings.h> -#endif -#if defined(HAVE_MEMORY_H) -# include <memory.h> -#endif +#include <string.h> #define EOS_CHAR '\0'