Mercurial > hg > xemacs-beta
comparison nt/inc/sys/socket.h @ 239:41f2f0e326e9 r20-5b18
Import from CVS: tag r20-5b18
author | cvs |
---|---|
date | Mon, 13 Aug 2007 10:15:48 +0200 |
parents | 7d55a9ba150c |
children | c42ec1d1cded |
comparison
equal
deleted
inserted
replaced
238:b5f2e56b938d | 239:41f2f0e326e9 |
---|---|
12 #ifdef select | 12 #ifdef select |
13 #undef select | 13 #undef select |
14 #define MUST_REDEF_SELECT | 14 #define MUST_REDEF_SELECT |
15 #endif | 15 #endif |
16 | 16 |
17 #if 0 /* What's wrong with winsock.h version ? - kkm */ | |
17 /* avoid clashing with our version of FD_SET if already defined */ | 18 /* avoid clashing with our version of FD_SET if already defined */ |
18 #ifdef FD_SET | 19 #ifdef FD_SET |
19 #undef FD_SET | 20 #undef FD_SET |
20 #undef FD_CLR | 21 #undef FD_CLR |
21 #undef FD_ISSET | 22 #undef FD_ISSET |
22 #undef FD_ZERO | 23 #undef FD_ZERO |
23 #endif | 24 #endif |
24 | 25 |
25 /* allow us to provide our own version of fd_set */ | 26 /* allow us to provide our own version of fd_set */ |
26 #define fd_set ws_fd_set | 27 #define fd_set ws_fd_set |
28 #endif /* 0 */ | |
27 | 29 |
28 /* avoid duplicate definition of timeval */ | 30 /* avoid duplicate definition of timeval */ |
29 #ifdef HAVE_TIMEVAL | 31 #ifdef HAVE_TIMEVAL |
30 #define timeval ws_timeval | 32 #define timeval ws_timeval |
31 #endif | 33 #endif |
36 #ifdef MUST_REDEF_SELECT | 38 #ifdef MUST_REDEF_SELECT |
37 #define select sys_select | 39 #define select sys_select |
38 #undef MUST_REDEF_SELECT | 40 #undef MUST_REDEF_SELECT |
39 #endif | 41 #endif |
40 | 42 |
43 #if 0 /* What's wrong with winsock.h version ? - kkm */ | |
41 /* revert to our version of FD_SET */ | 44 /* revert to our version of FD_SET */ |
42 #undef FD_SET | 45 #undef FD_SET |
43 #undef FD_CLR | 46 #undef FD_CLR |
44 #undef FD_ISSET | 47 #undef FD_ISSET |
45 #undef FD_ZERO | 48 #undef FD_ZERO |
46 #undef fd_set | 49 #undef fd_set |
47 #include "nt.h" | 50 #include "nt.h" |
51 #endif /* 0 */ | |
48 | 52 |
49 #ifdef HAVE_TIMEVAL | 53 #ifdef HAVE_TIMEVAL |
50 #undef timeval | 54 #undef timeval |
51 #endif | 55 #endif |
52 | 56 |