Fix the w32 build after 2010-08-22T15:14:37Z!dann@ics.uci.edu.

 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 86b94e10d90a73e248556fb5b60cd039586cf59b..4add0968b6e994a2de257c4c001fd61d2279cfa5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2010-08-22  Eli Zaretskii  <eliz@gnu.org>
 
+       * 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.
+
        * unexcoff.c (report_error, make_hdr, write_segment)
        (copy_text_and_data, copy_sym, mark_x, adjust_lnnoptrs, unexec):
        Convert argument lists and prototypes to ANSI C.

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index fc86ae6cb0cce913ab2b1a554b407684b6d10849..8d99d6cedfe2a92b8c21f72521869b4216466d55 100644 (file)
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1357,6 +1357,7 @@ $(BLD)/sysdep.$(O) : \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
        $(SRC)/process.h \
+       $(SRC)/sysselect.h \
        $(SRC)/syssignal.h \
        $(SRC)/systime.h \
        $(SRC)/systty.h \

diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index f61fae57eff28fa62f1f69f0506c462d83163639..4ae5f32e873acc9fbd29126421db578897c6d5ab 100644 (file)
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -106,7 +106,6 @@ struct sigaction {
 #define HAVE_SOUND  1
 #define LISP_FLOAT_TYPE 1
 
-#undef  HAVE_SYS_SELECT_H
 #define HAVE_SYS_TIMEB_H 1
 #define HAVE_SYS_TIME_H 1
 #define HAVE_UNISTD_H 1

diff --git a/src/sysselect.h b/src/sysselect.h
index ddb3e91f2e316d72b1b739330b6bedfff19a4f96..0c90814390ccee37aea7f1b8b0cad510171f7ac3 100644 (file)
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -27,6 +27,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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