diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-23 11:27:22 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-23 11:27:22 -0700 |
| commit | 39577d07124ee16895b9c6aab7e2c6e7d41cc715 (patch) | |
| tree | 42d8be58eecc9ab22b7e65e54080414c49037b4c /lib | |
| parent | 77557ce8ca903d5358808d34c9d80fc4be8e1759 (diff) | |
| parent | ad250f2b673f3ca9d1e22c01ae4d0e83fabb4520 (diff) | |
Merge from origin/emacs-25
ad250f2 Sync with gnulib
c0165ea Resurrect GNUS-NEWS autogeneration
# Conflicts:
# etc/GNUS-NEWS
# lisp/Makefile.in
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 a557e04ab5..9a2622f978 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 |