Andrew Nguyen : include: Revise the Winsock include in windows. h to match the Windows SDK.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: aca2385d6c79dd0499bd8ffbee2dbc9370208a36
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=aca2385d6c79dd0499bd8ffbee...

Author: Andrew Nguyen <anguyen(a)codeweavers.com>
Date:   Thu May 19 07:10:09 2011 -0500

include: Revise the Winsock include in windows.h to match the Windows SDK.

---

 dlls/ws2_32/tests/sock.c     |    1 +
 include/windows.h            |    2 +-
 programs/ipconfig/ipconfig.c |    1 +
 3 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index c032c11..ac0a7d0 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -22,6 +22,7 @@
 
 #include <ntstatus.h>
 #define WIN32_NO_STATUS
+#include <winsock2.h>
 #include <windows.h>
 #include <ws2tcpip.h>
 #include <mswsock.h>
diff --git a/include/windows.h b/include/windows.h
index af83f83..7cd8a83 100644
--- a/include/windows.h
+++ b/include/windows.h
@@ -63,7 +63,7 @@
 /* #include <winperf.h> */
 
 #ifndef WINE_NOWINSOCK
-#include <winsock2.h>
+#include <winsock.h>
 #endif /* WINE_NOWINSOCK */
 
 #ifndef NOCRYPT
diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c
index 50f7e6c..14974ae 100644
--- a/programs/ipconfig/ipconfig.c
+++ b/programs/ipconfig/ipconfig.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <winsock2.h>
 #include <windows.h>
 #include <iphlpapi.h>
 #include <wine/unicode.h>