[Emacs-diffs] /srv/bzr/emacs/trunk r101164: Fix the w32 build after revno 101162.

[Eli Zaretskii]

------------------------------------------------------------
revno: 101164
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2010-08-22 20:00:08 +0300
message:
  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.
modified:
  src/ChangeLog
  src/makefile.w32-in
  src/s/ms-w32.h
  src/sysselect.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-22 15:43:00 +0000
+++ b/src/ChangeLog     2010-08-22 17:00:08 +0000
@@ -1,5 +1,13 @@
 2010-08-22  Eli Zaretskii  <address@hidden>
 
+       * 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.

=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in       2010-08-06 12:25:10 +0000
+++ b/src/makefile.w32-in       2010-08-22 17:00:08 +0000
@@ -1357,6 +1357,7 @@
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
        $(SRC)/process.h \
+       $(SRC)/sysselect.h \
        $(SRC)/syssignal.h \
        $(SRC)/systime.h \
        $(SRC)/systty.h \

=== modified file 'src/s/ms-w32.h'
--- a/src/s/ms-w32.h    2010-07-29 03:25:08 +0000
+++ b/src/s/ms-w32.h    2010-08-22 17:00:08 +0000
@@ -106,7 +106,6 @@
 #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

=== modified file 'src/sysselect.h'
--- a/src/sysselect.h   2010-01-13 08:35:10 +0000
+++ b/src/sysselect.h   2010-08-22 17:00:08 +0000
@@ -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