From: Bruno Haible <bruno@clisp.org>
Date: Mon, 15 Dec 2008 12:39:49 +0000 (+0100)
Subject: Fix compilation error on OSF/1 4.0.
X-Git-Tag: v0.1~6603
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=96a634e2638dfcb8d3e47dca6e149a2553343b30;p=gnulib.git

Fix compilation error on OSF/1 4.0.
---

diff --git a/ChangeLog b/ChangeLog
index 76652b060..e7e0d686b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-12-15  Bruno Haible  <bruno@clisp.org>
 
+	Fix compilation error on OSF/1 4.0.
+	* lib/sys_select.in.h: When invoked from OSF/1 <sys/types.h> or
+	<sys/time.h>, simply delegate to the system header.
+	Reported by Daniel Richard G. <oss@teragram.com>.
+
+2008-12-15  Bruno Haible  <bruno@clisp.org>
+
 	* doc/posix-functions/openat.texi: Mention the 'openat' module.
 	* doc/posix-functions/fchmodat.texi: Likewise.
 	* doc/posix-functions/fchownat.texi: Likewise.
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h
index 2d2042783..00e8b2e67 100644
--- a/lib/sys_select.in.h
+++ b/lib/sys_select.in.h
@@ -15,14 +15,28 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _GL_SYS_SELECT_H
-
-#if @HAVE_SYS_SELECT_H@
-
 # if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 # endif
 
+/* On OSF/1, <sys/types.h> and <sys/time.h> include <sys/select.h>.
+   Simply delegate to the system's header in this case.  */
+#if @HAVE_SYS_SELECT_H@ && defined __osf__ && (defined _SYS_TYPES_H_ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H) && defined _OSF_SOURCE
+
+# define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H
+# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
+
+#elif @HAVE_SYS_SELECT_H@ && defined __osf__ && (defined _SYS_TIME_H_ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H) && defined _OSF_SOURCE
+
+# define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H
+# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
+
+#else
+
+#ifndef _GL_SYS_SELECT_H
+
+#if @HAVE_SYS_SELECT_H@
+
 /* On many platforms, <sys/select.h> assumes prior inclusion of
    <sys/types.h>.  */
 # include <sys/types.h>
@@ -76,3 +90,4 @@ extern int rpl_select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
 
 #endif /* _GL_SYS_SELECT_H */
 #endif /* _GL_SYS_SELECT_H */
+#endif /* OSF/1 */