# HG changeset patch # User Bruno Haible # Date 1263896238 -3600 # Node ID 4418796e7e4adcfae9bff36aa578a4d7f24e8463 # Parent 410eaa89fb57eddfc15c30fa0ca192376636a115 Avoid compilation error with cc on OSF/1 5.1. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-01-19 Bruno Haible + + Avoid compilation error with cc on OSF/1 5.1. + * lib/fcntl.in.h: Include after the #include_next + statement, not before. + Reported by Ralf Wildenhues . + 2010-01-18 Bruno Haible Avoid a link error due to the __printf__ symbol. diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -27,7 +27,6 @@ #include #ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems. */ # include -# include #endif #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ @@ -39,7 +38,6 @@ #include #ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems. */ # include -# include #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 +#endif + /* The definition of GL_LINK_WARNING is copied here. */