Mercurial > emacs
changeset 109951:63671fb2a78d
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 | 5bf026670e73 |
| children | 2a42692178ca bcdbcc64ea7d |
| files | src/ChangeLog src/makefile.w32-in src/s/ms-w32.h src/sysselect.h |
| diffstat | 4 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Aug 22 18:43:00 2010 +0300 +++ b/src/ChangeLog Sun Aug 22 20:00:08 2010 +0300 @@ -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.
--- a/src/makefile.w32-in Sun Aug 22 18:43:00 2010 +0300 +++ b/src/makefile.w32-in Sun Aug 22 20:00:08 2010 +0300 @@ -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 \
--- a/src/s/ms-w32.h Sun Aug 22 18:43:00 2010 +0300 +++ b/src/s/ms-w32.h Sun Aug 22 20:00:08 2010 +0300 @@ -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
--- 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