Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16347:a813bd88fc8d
sys_select: Avoid syntax error on OpenBSD 5.0.
* lib/sys_select.in.h: Include <signal.h> only after the include_next
<sys/select.h>, not before.
Reported by Jiri B <jirib@devio.us>.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sat, 04 Feb 2012 14:50:20 +0100 |
parents | aef1ea36022d |
children | b854ad995083 |
files | ChangeLog lib/sys_select.in.h |
diffstat | 2 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-02-04 Bruno Haible <bruno@clisp.org> + + sys_select: Avoid syntax error on OpenBSD 5.0. + * lib/sys_select.in.h: Include <signal.h> only after the include_next + <sys/select.h>, not before. + Reported by Jiri B <jirib@devio.us>. + 2012-02-04 Bruno Haible <bruno@clisp.org> get-rusage-as, get-rusage-data tests: Avoid test failure with gcc-4.7.
--- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -51,12 +51,6 @@ in <signal.h> where it belongs. */ #include <sys/types.h> -/* Get definition of 'sigset_t'. - But avoid namespace pollution on glibc systems. */ -#if !(defined __GLIBC__ && !defined __UCLIBC__) -# include <signal.h> -#endif - #if @HAVE_SYS_SELECT_H@ /* On OSF/1 4.0, <sys/select.h> provides only a forward declaration @@ -81,6 +75,14 @@ #endif +/* Get definition of 'sigset_t'. + But avoid namespace pollution on glibc systems. + Do this after the include_next (for the sake of OpenBSD 5.0) but before + the split double-inclusion guard (for the sake of Solaris). */ +#if !(defined __GLIBC__ && !defined __UCLIBC__) +# include <signal.h> +#endif + #ifndef _@GUARD_PREFIX@_SYS_SELECT_H #define _@GUARD_PREFIX@_SYS_SELECT_H