commit 272023190e042d9d107ab8b620ccedc7b73094d0
author Francois Gouget <fgouget@free.fr> Wed Nov 14 21:26:23 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Nov 14 21:26:23 2001 +0000
tree e11b0a501fc0d5409405255588641f531b5af307
parent c3daf4226816064602b5121b77917e0efd767c15

Make winsock.h and winsock2.h independent from the Unix headers.
Make them compatible with both the Unix C headers and the MSVCRT
headers.
Ensure compatibility with the Unix headers via the USE_WS_PREFIX
macro.
Add WINE_NOWINSOCK: prevents winsock.h from being included from
windows.h when defined.
Add ws2tcpip.h, move definitions to the right header.

include/windows.h

diff --git a/include/windows.h b/include/windows.h
index 595294f..a041926 100644
--- a/include/windows.h
+++ b/include/windows.h
@@ -35,8 +35,10 @@
 #include "shellapi.h"
 /* #include "winperf.h" */
 
+#ifndef WINE_NOWINSOCK
 #include "winsock2.h"
 /* #include "mswsock.h" */
+#endif /* WINE_NOWINSOCK */
 
 #ifndef NOCRYPT
 #include "wincrypt.h"