Mercurial > hg > octave-nkf > gnulib-hg
changeset 15489:0377e22dd6c8
sys_utsname: Add support for Minix.
* lib/sys_utsname.in.h [Minix]: Include <stddef.h> before
<sys/utsname.h>.
* m4/sys_utsname_h.m4 (gl_SYS_UTSNAME_H): Likewise.
* doc/posix-headers/sys_utsname.texi: Document the Minix problem.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 31 Jul 2011 23:28:02 +0200 |
parents | d9061bf1cead |
children | 2aa19fbd074d |
files | ChangeLog doc/posix-headers/sys_utsname.texi lib/sys_utsname.in.h m4/sys_utsname_h.m4 |
diffstat | 4 files changed, 28 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-07-31 Bruno Haible <bruno@clisp.org> + + sys_utsname: Add support for Minix. + * lib/sys_utsname.in.h [Minix]: Include <stddef.h> before + <sys/utsname.h>. + * m4/sys_utsname_h.m4 (gl_SYS_UTSNAME_H): Likewise. + * doc/posix-headers/sys_utsname.texi: Document the Minix problem. + 2011-07-31 Bruno Haible <bruno@clisp.org> strings: Add support for Minix.
--- a/doc/posix-headers/sys_utsname.texi +++ b/doc/posix-headers/sys_utsname.texi @@ -10,6 +10,9 @@ @item This header file is missing on some platforms: mingw. +@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/sys_utsname.in.h +++ b/lib/sys_utsname.in.h @@ -23,7 +23,15 @@ @PRAGMA_COLUMNS@ #if @HAVE_SYS_UTSNAME_H@ + +/* Minix 3.1.8 has a bug: <stddef.h> must be included before <sys/utsname.h>. + But avoid namespace pollution on glibc systems. */ +# if defined __minix && !defined __GLIBC__ +# include <stddef.h> +# endif + # @INCLUDE_NEXT@ @NEXT_SYS_UTSNAME_H@ + #endif #define _@GUARD_PREFIX@_SYS_UTSNAME_H
--- a/m4/sys_utsname_h.m4 +++ b/m4/sys_utsname_h.m4 @@ -1,4 +1,4 @@ -# sys_utsname_h.m4 serial 7 +# sys_utsname_h.m4 serial 8 dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -20,6 +20,9 @@ else HAVE_SYS_UTSNAME_H=1 AC_CHECK_TYPES([struct utsname], [], [HAVE_STRUCT_UTSNAME=0], [[ +/* Minix 3.1.8 has a bug: <stddef.h> must be included before + <sys/utsname.h>. */ +#include <stddef.h> #include <sys/utsname.h> ]]) fi @@ -27,7 +30,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 <sys/utsname.h> + gl_WARN_ON_USE_PREPARE([[ + /* Minix 3.1.8 has a bug: <stddef.h> must be included before + <sys/utsname.h>. */ + #include <stddef.h> + #include <sys/utsname.h> ]], [uname]) ])