diff options
author | Bruno Haible <bruno@clisp.org> | 2012-02-04 14:50:20 +0100 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2012-02-04 14:50:20 +0100 |
commit | 2bcfa56c2934e858594b8cdf52020af169b03814 (patch) | |
tree | 10467f123c4e92b643408cac3721f59d36b66f1d /lib/sys_select.in.h | |
parent | 4ddd9dd5c80d2058001c9bec68b7f0ef0bc3a56f (diff) | |
download | gnulib-2bcfa56c2934e858594b8cdf52020af169b03814.tar.gz |
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>.
Diffstat (limited to 'lib/sys_select.in.h')
-rw-r--r-- | lib/sys_select.in.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index 5311f437e0..96edb3ddde 100644 --- 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 |