# HG changeset patch # User Bruno Haible # Date 1328363420 -3600 # Node ID a813bd88fc8d262e3387bec4120024bef6b0f527 # Parent aef1ea36022df5e737f80e0216700f16e3037f7f sys_select: Avoid syntax error on OpenBSD 5.0. * lib/sys_select.in.h: Include only after the include_next , not before. Reported by Jiri B . diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-02-04 Bruno Haible + + sys_select: Avoid syntax error on OpenBSD 5.0. + * lib/sys_select.in.h: Include only after the include_next + , not before. + Reported by Jiri B . + 2012-02-04 Bruno Haible get-rusage-as, get-rusage-data tests: Avoid test failure with gcc-4.7. diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -51,12 +51,6 @@ in where it belongs. */ #include -/* Get definition of 'sigset_t'. - But avoid namespace pollution on glibc systems. */ -#if !(defined __GLIBC__ && !defined __UCLIBC__) -# include -#endif - #if @HAVE_SYS_SELECT_H@ /* On OSF/1 4.0, 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 +#endif + #ifndef _@GUARD_PREFIX@_SYS_SELECT_H #define _@GUARD_PREFIX@_SYS_SELECT_H