diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-08-11 17:52:17 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-08-11 17:52:17 -0700 |
| commit | eaca0446e72c1a62e259c0ee0eabdd6a0443e5c8 (patch) | |
| tree | 5d0d07c792c47fc34bd9086a689f460fd45b741d /lib/fpending.h | |
| parent | 808190e694c48dd9bf851baf114c095f39794c37 (diff) | |
| download | emacs-eaca0446e72c1a62e259c0ee0eabdd6a0443e5c8.tar.gz emacs-eaca0446e72c1a62e259c0ee0eabdd6a0443e5c8.tar.bz2 emacs-eaca0446e72c1a62e259c0ee0eabdd6a0443e5c8.zip | |
Merge from gnulib.
This incorporates:
2013-08-11 fpending: port to recent Cygwin change to stdio_ext.h
2013-08-10 sys_time: port to OpenBSD
Diffstat (limited to 'lib/fpending.h')
| -rw-r--r-- | lib/fpending.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/fpending.h b/lib/fpending.h index bf40d3732e7..4eca3f18e17 100644 --- a/lib/fpending.h +++ b/lib/fpending.h @@ -20,11 +20,10 @@ #include <stddef.h> #include <stdio.h> +#if HAVE_STDIO_EXT_H +# include <stdio_ext.h> +#endif -#if HAVE_DECL___FPENDING -# if HAVE_STDIO_EXT_H -# include <stdio_ext.h> -# endif -#else +#ifndef __fpending size_t __fpending (FILE *); #endif |