Mercurial > hg > octave-nkf > gnulib-hg
changeset 15488:d9061bf1cead
strings: Add support for Minix.
* lib/strings.in.h [Minix]: Include <sys/types.h> before <strings.h>.
* m4/strings_h.m4 (gl_HEADER_STRINGS_H_BODY): Likewise.
* doc/posix-headers/strings.texi: Document the Minix problem.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 31 Jul 2011 23:03:25 +0200 |
parents | fe7627541c17 |
children | 0377e22dd6c8 |
files | ChangeLog doc/posix-headers/strings.texi lib/strings.in.h m4/strings_h.m4 |
diffstat | 4 files changed, 22 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-07-31 Bruno Haible <bruno@clisp.org> + + strings: Add support for Minix. + * lib/strings.in.h [Minix]: Include <sys/types.h> before <strings.h>. + * m4/strings_h.m4 (gl_HEADER_STRINGS_H_BODY): Likewise. + * doc/posix-headers/strings.texi: Document the Minix problem. + 2011-07-31 Bruno Haible <bruno@clisp.org> wctype-h: Add support for Minix.
--- a/doc/posix-headers/strings.texi +++ b/doc/posix-headers/strings.texi @@ -7,6 +7,9 @@ Portability problems fixed by Gnulib: @itemize +@item +This header file is not self-contained on some platforms: +Minix 3.1.8. @end itemize Portability problems not fixed by Gnulib:
--- a/lib/strings.in.h +++ b/lib/strings.in.h @@ -23,6 +23,12 @@ #endif @PRAGMA_COLUMNS@ +/* Minix 3.1.8 has a bug: <sys/types.h> must be included before <strings.h>. + But avoid namespace pollution on glibc systems. */ +#if defined __minix && !defined __GLIBC__ +# include <sys/types.h> +#endif + /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_STRINGS_H@
--- a/m4/strings_h.m4 +++ b/m4/strings_h.m4 @@ -1,5 +1,5 @@ # Configure a replacement for <strings.h>. -# serial 4 +# serial 5 # Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -20,7 +20,11 @@ dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use. - gl_WARN_ON_USE_PREPARE([[#include <strings.h> + gl_WARN_ON_USE_PREPARE([[ + /* Minix 3.1.8 has a bug: <sys/types.h> must be included before + <strings.h>. */ + #include <sys/types.h> + #include <strings.h> ]], [ffs strcasecmp strncasecmp]) ])