diff options
author | Bruno Haible <bruno@clisp.org> | 2010-01-19 11:17:18 +0100 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2010-01-19 11:17:18 +0100 |
commit | 102c411be0dfd9ac6aa0bb6450415e87bf0842ca (patch) | |
tree | a78a663687540dbe1eb688df84b12367173f9106 | |
parent | 4a24fcd6cf5620964e71361c57c2b273225dc47a (diff) | |
download | gnulib-102c411be0dfd9ac6aa0bb6450415e87bf0842ca.tar.gz |
Avoid compilation error with cc on OSF/1 5.1.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | lib/fcntl.in.h | 6 |
2 files changed, 11 insertions, 2 deletions
@@ -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 92bb50d5c6..b0a90fc746 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. */ |