Commit a583bbef authored by Eli Zaretskii's avatar Eli Zaretskii

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.
parent 22eec924
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.
......
......@@ -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 \
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment