From: Bruno Haible Date: Thu, 1 Sep 2011 10:15:11 +0000 (+0200) Subject: sys_select: Avoid a syntax error regarding timespec_t on IRIX 6.5. X-Git-Tag: v0.1~1980 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=8b18afa751dc5b8ab392fa5c566d25e14f5825ab;p=gnulib.git sys_select: Avoid a syntax error regarding timespec_t on IRIX 6.5. * lib/sys_select.in.h [__sgi]: When included from , just include the system's header. --- diff --git a/ChangeLog b/ChangeLog index 2c6a3b2e20..bee4d57308 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-09-01 Bruno Haible + + sys_select: Avoid a syntax error regarding timespec_t on IRIX 6.5. + * lib/sys_select.in.h [__sgi]: When included from , + just include the system's header. + 2011-08-31 Jim Meyering tests: avoid spurious assertion failure in test-float.c on ppc64 diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index 836a387341..7d43c2782b 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -32,6 +32,16 @@ # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ +/* On IRIX 6.5, includes , which includes + , which includes . At this point we cannot + include , because that includes , which + gives a syntax error because has not been completely + processed. Simply delegate to the system's header in this case. */ +#elif @HAVE_SYS_SELECT_H@ && defined __sgi && (defined _SYS_BSD_TYPES_H && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_BSD_TYPES_H) + +# define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_BSD_TYPES_H +# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ + #else #ifndef _@GUARD_PREFIX@_SYS_SELECT_H