Mercurial > hg > octave-lojdl > gnulib-hg

changeset 12763:4418796e7e4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid compilation error with cc on OSF/1 5.1.
author Bruno Haible <bruno@clisp.org>
date Tue, 19 Jan 2010 11:17:18 +0100
parents 410eaa89fb57
children 602d53045ee7
files ChangeLog lib/fcntl.in.h
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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.  */