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 | |
| parent | 808190e694c48dd9bf851baf114c095f39794c37 (diff) | |
| download | emacs-eaca0446e72c1a62e259c0ee0eabdd6a0443e5c8.tar.gz | |
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')
| -rw-r--r-- | lib/fpending.h | 9 | ||||
| -rw-r--r-- | lib/sys_time.in.h | 5 |
2 files changed, 7 insertions, 7 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 diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index 3dbf6320667..f721580a765 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -24,11 +24,12 @@ #endif @PRAGMA_COLUMNS@ -/* On Cygwin, <sys/time.h> includes itself recursively via <sys/select.h>. +/* On Cygwin and on many BSDish systems, <sys/time.h> includes itself + recursively via <sys/select.h>. Simply delegate to the system's header in this case; it is a no-op. Without this extra ifdef, the C++ gettimeofday declaration below would be a forward declaration in gnulib's nested <sys/time.h>. */ -#ifdef _CYGWIN_SYS_TIME_H +#if defined _CYGWIN_SYS_TIME_H || defined _SYS_TIME_H || defined _SYS_TIME_H_ # @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ #else |