diff options
| author | Paul Eggert | 2014-09-23 11:20:38 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-09-23 11:20:38 -0700 |
| commit | dac5be10f3f08c78cf98a4b9d4774b46b16ace40 (patch) | |
| tree | 033b7d9bd6a55d38a92238f99c85aa88e9f05fed /lib | |
| parent | 97914756e8de76b8e83550eab2e12e5dfcb87754 (diff) | |
| download | emacs-dac5be10f3f08c78cf98a4b9d4774b46b16ace40.tar.gz emacs-dac5be10f3f08c78cf98a4b9d4774b46b16ace40.zip | |
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 @@ | |||
| 34 | extern "C" { ... } block, which leads to errors in C++ mode with the | 34 | extern "C" { ... } block, which leads to errors in C++ mode with the |
| 35 | overridden <sys/stat.h> from gnulib. These errors are known to be gone | 35 | overridden <sys/stat.h> from gnulib. These errors are known to be gone |
| 36 | with g++ version >= 4.3. */ | 36 | with g++ version >= 4.3. */ |
| 37 | #if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) | 37 | #if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))) |
| 38 | # include <sys/stat.h> | 38 | # include <sys/stat.h> |
| 39 | #endif | 39 | #endif |
| 40 | #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ | 40 | #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ |
| @@ -53,7 +53,7 @@ | |||
| 53 | extern "C" { ... } block, which leads to errors in C++ mode with the | 53 | extern "C" { ... } block, which leads to errors in C++ mode with the |
| 54 | overridden <sys/stat.h> from gnulib. These errors are known to be gone | 54 | overridden <sys/stat.h> from gnulib. These errors are known to be gone |
| 55 | with g++ version >= 4.3. */ | 55 | with g++ version >= 4.3. */ |
| 56 | #if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) | 56 | #if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))) |
| 57 | # include <sys/stat.h> | 57 | # include <sys/stat.h> |
| 58 | #endif | 58 | #endif |
| 59 | /* The include_next requires a split double-inclusion guard. */ | 59 | /* The include_next requires a split double-inclusion guard. */ |