Mercurial > gnulib

changeset 37438:6024c429bd6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fcntl-h: fix compilation with Intel C++ compiler * lib/fcntl.in.h: ICC has the same issue as GCC <= 4.2.
author Johannes Zarl <johannes.zarl@jku.at>
date Thu, 11 Sep 2014 14:38:53 +0100
parents 7ab8df4c1351
children 54c651f31def
files ChangeLog lib/fcntl.in.h
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Sep 11 06:01:12 2014 -0700
+++ b/ChangeLog	Thu Sep 11 14:38:53 2014 +0100
@@ -1,3 +1,8 @@
+2014-09-11  Johannes Zarl  <johannes.zarl@jku.at>
+
+	fcntl-h: fix compilation with Intel C++ compiler (trivial)
+	* lib/fcntl.in.h: ICC has the same issue as GCC <= 4.2.
+
 2014-09-09  Fridolin Pokorny  <fpokorny@redhat.com>
 
 	mountlist: use /proc/self/mountinfo when available
--- a/lib/fcntl.in.h	Thu Sep 11 06:01:12 2014 -0700
+++ b/lib/fcntl.in.h	Thu Sep 11 14:38:53 2014 +0100
@@ -34,7 +34,7 @@
    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 __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
+#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))))
 # include <sys/stat.h>
 #endif
 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@
@@ -53,7 +53,7 @@
    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 __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
+#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))))
 # include <sys/stat.h>
 #endif
 /* The include_next requires a split double-inclusion guard.  */