From 102c411be0dfd9ac6aa0bb6450415e87bf0842ca Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 19 Jan 2010 11:17:18 +0100 Subject: [PATCH] Avoid compilation error with cc on OSF/1 5.1. --- ChangeLog | 7 +++++++ lib/fcntl.in.h | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ac094f893..69cd50d9c6 100644 --- 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 index 92bb50d5c6..b0a90fc746 100644 --- 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. */ -- 2.30.2