From: Bruno Haible <bruno@clisp.org>
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: stable/20110908~29
X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=c948e19ae09f5a06406206eac767d2d0124745e6

sys_select: Avoid a syntax error regarding timespec_t on IRIX 6.5.

* lib/sys_select.in.h [__sgi]: When included from <sys/bsd_types.h>,
just include the system's header.
(cherry picked from commit 8b18afa751dc5b8ab392fa5c566d25e14f5825ab)
---

diff --git a/ChangeLog b/ChangeLog
index eed8394ce..cfab565de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-01  Bruno Haible  <bruno@clisp.org>
+
+	sys_select: Avoid a syntax error regarding timespec_t on IRIX 6.5.
+	* lib/sys_select.in.h [__sgi]: When included from <sys/bsd_types.h>,
+	just include the system's header.
+
 2011-08-31  Jim Meyering  <meyering@redhat.com>
 
 	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 836a38734..7d43c2782 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, <sys/timespec.h> includes <sys/types.h>, which includes
+   <sys/bsd_types.h>, which includes <sys/select.h>.  At this point we cannot
+   include <signal.h>, because that includes <internal/signal_core.h>, which
+   gives a syntax error because <sys/timespec.h> 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