Mercurial > emacs

diff src/sysselect.h @ 109951:63671fb2a78d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix the w32 build after revno 101162. sysselect.h [WINDOWSNT]: Don't define the FD_* and select stuff for w32. s/ms-w32.h (HAVE_SYS_TIMEB_H): Don't #undef HAVE_SYS_SELECT_H, it's done in nt/config.nt. makefile.w32-in ($(BLD)/sysdep.$(O)): Depend on sysselect.h.
author Eli Zaretskii <eliz@gnu.org>
date Sun, 22 Aug 2010 20:00:08 +0300
parents 1d1d5d9bd884
children 417b1e4d63cd
line wrap: on
line diff
--- a/src/sysselect.h	Sun Aug 22 18:43:00 2010 +0300
+++ b/src/sysselect.h	Sun Aug 22 20:00:08 2010 +0300
@@ -27,6 +27,10 @@
 #endif
 #endif
 
+/* The w32 build defines select stuff in w32.h, which is included
+   where w32 needs it, but not where sysselect.h is included.  The w32
+   definitions in w32.h are incompatible with the below.  */
+#ifndef WINDOWSNT
 #ifdef FD_SET
 #ifdef FD_SETSIZE
 #define MAXDESC FD_SETSIZE
@@ -44,6 +48,7 @@
 #define FD_ISSET(n, p) (*(p) & (1 << (n)))
 #define FD_ZERO(p) (*(p) = 0)
 #endif /* no FD_SET */
+#endif /* not WINDOWSNT */
 
 #if !defined (HAVE_SELECT)
 #define select sys_select