diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-23 11:17:37 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-23 11:19:52 -0700 |
| commit | ad250f2b673f3ca9d1e22c01ae4d0e83fabb4520 (patch) | |
| tree | 2aa26f0265f03bb9b7bc3f4f04f8c63adc6d6322 /lib | |
| parent | c0165ea4d6ecf81db6728782c7322c311ee0a783 (diff) | |
| download | emacs-ad250f2b673f3ca9d1e22c01ae4d0e83fabb4520.tar.gz | |
Sync with gnulib
This incorporates:
2016-03-22 gitlog-to-changelog: suppress ignored chatter
2016-03-21 sys_select: port to new Cygwin
* build-aux/gitlog-to-changelog, doc/misc/texinfo.tex:
* lib/sys_select.in.h: Copy from gnulib.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sys_select.in.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index a557e04ab5d..9a2622f9789 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -81,8 +81,9 @@ of 'struct timeval', and no definition of this type. Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() in <sys/time.h>. - But avoid namespace pollution on glibc systems. */ -# ifndef __GLIBC__ + But avoid namespace pollution on glibc systems and "unknown type + name" problems on Cygwin. */ +# if !(defined __GLIBC__ || defined __CYGWIN__) # include <sys/time.h> # endif @@ -100,10 +101,11 @@ #endif /* Get definition of 'sigset_t'. - But avoid namespace pollution on glibc systems. + But avoid namespace pollution on glibc systems and "unknown type + name" problems on Cygwin. Do this after the include_next (for the sake of OpenBSD 5.0) but before the split double-inclusion guard (for the sake of Solaris). */ -#if !(defined __GLIBC__ && !defined __UCLIBC__) +#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__) # include <signal.h> #endif |