aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPaul Eggert2016-03-23 11:17:37 -0700
committerPaul Eggert2016-03-23 11:19:52 -0700
commitad250f2b673f3ca9d1e22c01ae4d0e83fabb4520 (patch)
tree2aa26f0265f03bb9b7bc3f4f04f8c63adc6d6322 /lib
parentc0165ea4d6ecf81db6728782c7322c311ee0a783 (diff)
downloademacs-ad250f2b673f3ca9d1e22c01ae4d0e83fabb4520.tar.gz
emacs-ad250f2b673f3ca9d1e22c01ae4d0e83fabb4520.zip
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.h10
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 @@
81 of 'struct timeval', and no definition of this type. 81 of 'struct timeval', and no definition of this type.
82 Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() 82 Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
83 in <sys/time.h>. 83 in <sys/time.h>.
84 But avoid namespace pollution on glibc systems. */ 84 But avoid namespace pollution on glibc systems and "unknown type
85# ifndef __GLIBC__ 85 name" problems on Cygwin. */
86# if !(defined __GLIBC__ || defined __CYGWIN__)
86# include <sys/time.h> 87# include <sys/time.h>
87# endif 88# endif
88 89
@@ -100,10 +101,11 @@
100#endif 101#endif
101 102
102/* Get definition of 'sigset_t'. 103/* Get definition of 'sigset_t'.
103 But avoid namespace pollution on glibc systems. 104 But avoid namespace pollution on glibc systems and "unknown type
105 name" problems on Cygwin.
104 Do this after the include_next (for the sake of OpenBSD 5.0) but before 106 Do this after the include_next (for the sake of OpenBSD 5.0) but before
105 the split double-inclusion guard (for the sake of Solaris). */ 107 the split double-inclusion guard (for the sake of Solaris). */
106#if !(defined __GLIBC__ && !defined __UCLIBC__) 108#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__)
107# include <signal.h> 109# include <signal.h>
108#endif 110#endif
109 111