Mercurial > emacs

changeset 31091:65f455b1ab20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(_WINSOCK_H): Undefine if defined. (fd_set): Define to new name, after including winsock.h, so we can provide our own implementation.
author Andrew Innes <andrewi@gnu.org>
date Tue, 22 Aug 2000 21:53:55 +0000
parents 69b7e5c8da03
children 6321f3da048f
files nt/inc/sys/socket.h
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/nt/inc/sys/socket.h	Tue Aug 22 21:53:28 2000 +0000
+++ b/nt/inc/sys/socket.h	Tue Aug 22 21:53:55 2000 +0000
@@ -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