diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-08-22 20:00:08 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-08-22 20:00:08 +0300 |
| commit | a583bbef0ea8fe8bbc12ba93fef83f079e04edaf (patch) | |
| tree | 6ccc4802bc4d1e0701cd66c2654e1e93a2c7fe7d /src/sysselect.h | |
| parent | 22eec92494d86a569c92722e538c6667833df380 (diff) | |
| download | emacs-a583bbef0ea8fe8bbc12ba93fef83f079e04edaf.tar.gz | |
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.
Diffstat (limited to 'src/sysselect.h')
| -rw-r--r-- | src/sysselect.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/sysselect.h b/src/sysselect.h index ddb3e91f2e3..0c90814390c 100644 --- 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 |