- Fix netstat build.

- Improve WSPSelect declarations in msafd.
- Include the correct wmilib header in wmi.
- Remove a commented out inclusion in ws2san.h

svn path=/branches/header-work/; revision=46763

base/applications/network/netstat/netstat.c

@@ -14,7 +14,7 @@
  */
 
 #include <windows.h>
-#include <winsock.h>
+#include <winsock2.h>
 #include <tchar.h>
 #include <stdio.h>
 #include <stdlib.h>

dll/win32/msafd/misc/dllmain.c

@@ -751,12 +751,12 @@ WSPListen(SOCKET Handle,
 
 int
 WSPAPI
-WSPSelect(int nfds,
-          fd_set *readfds,
-          fd_set *writefds,
-          fd_set *exceptfds,
-          const LPTIMEVAL timeout,
-          LPINT lpErrno)
+WSPSelect(IN int nfds,
+          IN OUT fd_set *readfds OPTIONAL,
+          IN OUT fd_set *writefds OPTIONAL,
+          IN OUT fd_set *exceptfds OPTIONAL,
+          IN const struct timeval *timeout OPTIONAL,
+          OUT LPINT lpErrno)
 {
     IO_STATUS_BLOCK     IOSB;
     PAFD_POLL_INFO      PollInfo;

dll/win32/msafd/msafd.h

@@ -325,10 +325,10 @@ INT
 WSPAPI
 WSPSelect(
     IN      INT nfds,
-    IN OUT  LPFD_SET readfds,
-    IN OUT  LPFD_SET writefds,
-    IN OUT  LPFD_SET exceptfds,
-    IN      CONST LPTIMEVAL timeout,
+    IN OUT  fd_set *readfds,
+    IN OUT  fd_set *writefds,
+    IN OUT  fd_set *exceptfds,
+    IN      CONST struct timeval *timeout,
     OUT     LPINT lpErrno);
 
 INT

drivers/wmi/wmilib.c

@@ -11,7 +11,7 @@
 
 #include <stdio.h>
 #include <ntddk.h>
-#include <wmlib.h>
+#include <wmilib.h>
 
 #define NDEBUG
 #include <debug.h>

include/ddk/ws2san.h

@@ -22,10 +22,6 @@
 
 #pragma once
 
-/* FIXME
-#include <winsock2.h>
-*/
-
 #ifdef __cplusplus
 extern "C" {
 #endif