From: Bruno Haible <bruno@clisp.org>
Date: Tue, 19 Jan 2010 10:17:18 +0000 (+0100)
Subject: Avoid compilation error with cc on OSF/1 5.1.
X-Git-Tag: v0.1~4724
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=102c411be0dfd9ac6aa0bb6450415e87bf0842ca;p=gnulib.git

Avoid compilation error with cc on OSF/1 5.1.
---

diff --git a/ChangeLog b/ChangeLog
index 0ac094f89..69cd50d9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-19  Bruno Haible  <bruno@clisp.org>
+
+	Avoid compilation error with cc on OSF/1 5.1.
+	* lib/fcntl.in.h: Include <unistd.h> after the #include_next <fcntl.h>
+	statement, not before.
+	Reported by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.
+
 2010-01-18  Bruno Haible  <bruno@clisp.org>
 
 	Avoid a link error due to the __printf__ symbol.
diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h
index 92bb50d5c..b0a90fc74 100644
--- a/lib/fcntl.in.h
+++ b/lib/fcntl.in.h
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems.  */
 # include <sys/stat.h>
-# include <unistd.h>
 #endif
 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@
 
@@ -39,7 +38,6 @@
 #include <sys/types.h>
 #ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems.  */
 # include <sys/stat.h>
-# include <unistd.h>
 #endif
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@
@@ -47,6 +45,10 @@
 #ifndef _GL_FCNTL_H
 #define _GL_FCNTL_H
 
+#ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems.  */
+# include <unistd.h>
+#endif
+
 
 /* The definition of GL_LINK_WARNING is copied here.  */