From 1878ede07212ff18029384dcc14a68b7adb74b3c Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Tue, 24 Sep 2002 01:47:27 +0000 Subject: [PATCH] * include/ws2tcpip.h: Throw error if winsock.h, not winsock2.h has been included first. --- winsup/w32api/ChangeLog | 7 ++++++- winsup/w32api/include/ws2tcpip.h | 8 +++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 04ff2fccc..8e514dd74 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,4 +1,9 @@ -2002-09-24 Rene Moeller Fonseca +2002-09-24 Danny Smith + + * include/ws2tcpip.h: Throw error if winsock.h, not winsock2.h + has been included first. + +2002-09-24 René Møller Fonseca * include/winbase.h (FindFirstFileEx): Fixed ANSI mode. * include/wingdi.h (PFD_SWAP_LAYER_BUFFERS):Added define. diff --git a/winsup/w32api/include/ws2tcpip.h b/winsup/w32api/include/ws2tcpip.h index 1b64dc9ca..97680f02c 100644 --- a/winsup/w32api/include/ws2tcpip.h +++ b/winsup/w32api/include/ws2tcpip.h @@ -12,6 +12,10 @@ #pragma GCC system_header #endif +#if (defined _WINSOCK_H && !defined _WINSOCK2_H) +#error "ws2tcpip.h is not compatable with winsock.h. Include winsock2.h instead." +#endif + #include #ifdef __cplusplus extern "C" { @@ -336,7 +340,5 @@ typedef struct _OLD_INTERFACE_INFO { #ifdef __cplusplus } #endif + #endif /* _WS2TCPIP_H */ - - -