diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-11-08 08:24:40 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-11-08 08:24:40 -0800 |
| commit | 220a304ac3e1948e40ea76a82bc62bd81c2a6906 (patch) | |
| tree | 258d6b1b3b7ef513a7e040faf7b3d687b1d93d03 /lib | |
| parent | 71731c03382ba72c08d8a8d15ee074b4d3c97e66 (diff) | |
| download | emacs-220a304ac3e1948e40ea76a82bc62bd81c2a6906.tar.gz | |
Merge from gnulib.
This incorporates:
2013-11-08 extern-inline: port better to OS X 10.9
2013-11-08 fpending: fix regression on DragonFly BSD
* lib/fpending.h, m4/extern-inline.m4, m4/fpending.m4:
Update from gnulib.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fpending.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fpending.h b/lib/fpending.h index 30d67fcd74f..306a083e34a 100644 --- a/lib/fpending.h +++ b/lib/fpending.h @@ -24,6 +24,6 @@ # include <stdio_ext.h> #endif -#ifndef __fpending +#if !HAVE_DECL___FPENDING size_t __fpending (FILE *) _GL_ATTRIBUTE_PURE; #endif |