From b8e2c7fd963b12cd95111a02a4458cdfc0a34fc0 Mon Sep 17 00:00:00 2001 From: Johannes Zarl Date: Thu, 11 Sep 2014 14:38:53 +0100 Subject: [PATCH] fcntl-h: fix compilation with Intel C++ compiler * lib/fcntl.in.h: ICC has the same issue as GCC <= 4.2. --- ChangeLog | 5 +++++ lib/fcntl.in.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b8202f206..fa7f84ff3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-09-11 Johannes Zarl + + 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 mountlist: use /proc/self/mountinfo when available diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index e23b4b2bcd..f63cd6a734 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -34,7 +34,7 @@ extern "C" { ... } block, which leads to errors in C++ mode with the overridden 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 #endif #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ @@ -53,7 +53,7 @@ extern "C" { ... } block, which leads to errors in C++ mode with the overridden 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 #endif /* The include_next requires a split double-inclusion guard. */ -- 2.39.5