summaryrefslogtreecommitdiffstats
path: root/winsup/w32api/include/windows.h
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2002-02-28 00:03:11 +0000
committerDanny Smith <dannysmith@users.sourceforge.net>2002-02-28 00:03:11 +0000
commitfd2ded00a7052833ade55edacb9fe676aed32d0c (patch)
tree691b629fa90af7cb87745967d0b261e610344fba /winsup/w32api/include/windows.h
parentafecf2faee6e15a0f4c230acf718abdef3c96844 (diff)
downloadcygnal-fd2ded00a7052833ade55edacb9fe676aed32d0c.tar.gz
cygnal-fd2ded00a7052833ade55edacb9fe676aed32d0c.tar.bz2
cygnal-fd2ded00a7052833ade55edacb9fe676aed32d0c.zip
* include/windows.h; Remove test for __W32API_MAJOR_VERSION
when selecting winsock interface. * include/winsock.h (SOCKET_ADDRESS_LIST): Add structure definition and typedefs. Expand FIXME comment. (WSACOMPLETIONTYPE): Add enum. (WSACOMPLETION): Add structure and typedefs. (WSANSPIoctl): Add function prototpe and callback typedef. (SIO_NSP_NOTIFY_CHANGE): Add define. (sockaddr_storage): Add structure and typedefs.
Diffstat (limited to 'winsup/w32api/include/windows.h')
-rw-r--r--winsup/w32api/include/windows.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h
index ce8928b76..267db18f1 100644
--- a/winsup/w32api/include/windows.h
+++ b/winsup/w32api/include/windows.h
@@ -146,7 +146,7 @@
#endif
#endif
#if defined(__USE_W32_SOCKETS) || !(defined(__CYGWIN__) || defined(__MSYS__) || defined(_UWIN))
-#if (_WIN32_WINNT >= 0x0400) && (__W32API_MAJOR_VERSION > 0)
+#if (_WIN32_WINNT >= 0x0400)
#include <winsock2.h>
/*
* MS likes to include mswsock.h here as well,
@@ -155,7 +155,7 @@
*/
#else
#include <winsock.h>
-#endif /* (_WIN32_WINNT >= 0x0400) && (__W32API_MAJOR_VERSION > 0) */
+#endif /* (_WIN32_WINNT >= 0x0400) */
#endif
#endif /* WIN32_LEAN_AND_MEAN */