Mercurial > hg > octave-lojdl > gnulib-hg

diff lib/fcntl.in.h @ 13851:a518692b40d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fcntl-h: Fix for use of C++ on glibc systems. * lib/fcntl.in.h: Include <sys/stat.h> before include_next <fcntl.h> also on glibc systems in C++ mode. Reported by Gary V. Vaughan <gary@gnu.org>.
author Bruno Haible <bruno@clisp.org>
date Fri, 12 Nov 2010 03:20:13 +0100
parents a19ace3ba849
children 87a95303747f
line wrap: on
line diff
--- a/lib/fcntl.in.h
+++ b/lib/fcntl.in.h
@@ -26,7 +26,13 @@
 /* Special invocation convention.  */
 
 #include <sys/types.h>
-#ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems.  */
+/* On some systems other than glibc, <sys/stat.h> is a prerequisite of
+   <fcntl.h>.  On glibc systems, we would like to avoid namespace pollution.
+   But on glibc systems, <fcntl.h> includes <sys/stat.h> inside an
+   extern "C" { ... } block, which leads to errors in C++ mode with the
+   overridden <sys/stat.h> from gnulib.  These errors are known to be gone
+   with g++ version >= 4.3.  */
+#if !defined __GLIBC__ || (defined __cplusplus && defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
 # include <sys/stat.h>
 #endif
 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@