martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Eli Zaretskii
2010-08-22 20:00:08 +03:00
parent 22eec92494
commit a583bbef0e
4 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sysselect.h
View File

@@ -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