diff options
| author | Eli Zaretskii | 2013-11-18 18:45:48 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-11-18 18:45:48 +0200 |
| commit | 18b35e2c7a3ff95fb4a07e58c3f57c70c65c0701 (patch) | |
| tree | 7a837a755a7c22d3258408cb384d01479ad88232 /lib | |
| parent | df87c56cdf6c8c13e8760bdc409e2eb0fda55b0b (diff) | |
| parent | 37c790b38599cc80a16c6a76152abbf8160fe2a1 (diff) | |
| download | emacs-18b35e2c7a3ff95fb4a07e58c3f57c70c65c0701.tar.gz emacs-18b35e2c7a3ff95fb4a07e58c3f57c70c65c0701.zip | |
Merge from mainline.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fpending.h | 4 | ||||
| -rw-r--r-- | lib/intprops.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/fpending.h b/lib/fpending.h index 4eca3f18e17..306a083e34a 100644 --- a/lib/fpending.h +++ b/lib/fpending.h | |||
| @@ -24,6 +24,6 @@ | |||
| 24 | # include <stdio_ext.h> | 24 | # include <stdio_ext.h> |
| 25 | #endif | 25 | #endif |
| 26 | 26 | ||
| 27 | #ifndef __fpending | 27 | #if !HAVE_DECL___FPENDING |
| 28 | size_t __fpending (FILE *); | 28 | size_t __fpending (FILE *) _GL_ATTRIBUTE_PURE; |
| 29 | #endif | 29 | #endif |
diff --git a/lib/intprops.h b/lib/intprops.h index f57f9b4ddab..1d2deb7fc25 100644 --- a/lib/intprops.h +++ b/lib/intprops.h | |||
| @@ -89,7 +89,8 @@ | |||
| 89 | 89 | ||
| 90 | /* Return 1 if the __typeof__ keyword works. This could be done by | 90 | /* Return 1 if the __typeof__ keyword works. This could be done by |
| 91 | 'configure', but for now it's easier to do it by hand. */ | 91 | 'configure', but for now it's easier to do it by hand. */ |
| 92 | #if 2 <= __GNUC__ || defined __IBM__TYPEOF__ || 0x5110 <= __SUNPRO_C | 92 | #if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ |
| 93 | || (0x5110 <= __SUNPRO_C && !__STDC__)) | ||
| 93 | # define _GL_HAVE___TYPEOF__ 1 | 94 | # define _GL_HAVE___TYPEOF__ 1 |
| 94 | #else | 95 | #else |
| 95 | # define _GL_HAVE___TYPEOF__ 0 | 96 | # define _GL_HAVE___TYPEOF__ 0 |