diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-09-23 11:20:38 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-09-23 11:20:38 -0700 |
| commit | dac5be10f3f08c78cf98a4b9d4774b46b16ace40 (patch) | |
| tree | 033b7d9bd6a55d38a92238f99c85aa88e9f05fed /lib | |
| parent | 97914756e8de76b8e83550eab2e12e5dfcb87754 (diff) | |
| download | emacs-dac5be10f3f08c78cf98a4b9d4774b46b16ace40.tar.gz | |
Merge from gnulib.
This incorporates:
2014-09-11 fcntl-h: fix compilation with Intel C++ compiler
2014-09-04 pthread, pthread_sigmask, threadlib: port to Ubuntu 14.04
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fcntl.in.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index e23b4b2bcdd..f63cd6a734c 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 <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. */ |