diff options
| author | Andrew Innes <andrewi@gnu.org> | 2000-08-22 21:53:55 +0000 |
|---|---|---|
| committer | Andrew Innes <andrewi@gnu.org> | 2000-08-22 21:53:55 +0000 |
| commit | 00a08ac7ce058debdd2e1c1b317e5e28c994e134 (patch) | |
| tree | 6378b21d9bc72275621c61401e50fd9d2942cbce /nt | |
| parent | 9366e3b092fd5b73cba4026e34bce29c90fd7fec (diff) | |
| download | emacs-00a08ac7ce058debdd2e1c1b317e5e28c994e134.tar.gz | |
(_WINSOCK_H): Undefine if defined.
(fd_set): Define to new name, after including winsock.h, so we can
provide our own implementation.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/inc/sys/socket.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h index 53326172fbd..669c2c741a7 100644 --- a/nt/inc/sys/socket.h +++ b/nt/inc/sys/socket.h @@ -7,6 +7,9 @@ #ifdef _WINSOCKAPI_ #undef _WINSOCKAPI_ #endif +#ifdef _WINSOCK_H +#undef _WINSOCK_H +#endif /* avoid confusion with our version of select */ #ifdef select @@ -22,9 +25,6 @@ #undef FD_ZERO #endif -/* allow us to provide our own version of fd_set */ -#define fd_set ws_fd_set - /* avoid duplicate definition of timeval */ #ifdef HAVE_TIMEVAL #define timeval ws_timeval @@ -43,7 +43,9 @@ #undef FD_CLR #undef FD_ISSET #undef FD_ZERO -#undef fd_set + +/* allow us to provide our own version of fd_set */ +#define fd_set ws_fd_set #include "w32.h" #ifdef HAVE_TIMEVAL |