diff options
Diffstat (limited to 'wsutil')
-rw-r--r-- | wsutil/socket.h | 11 | ||||
-rw-r--r-- | wsutil/tempfile.c | 5 |
2 files changed, 3 insertions, 13 deletions
diff --git a/wsutil/socket.h b/wsutil/socket.h index 372cd2f793..4c5a9fe95c 100644 --- a/wsutil/socket.h +++ b/wsutil/socket.h @@ -25,16 +25,9 @@ #define __SOCKET_H__ #if defined(_WIN32) && !defined(__CYGWIN__) - #ifdef HAVE_WINDOWS_H - #include <windows.h> - #endif - + #include <windows.h> #include <ws2tcpip.h> - - #ifdef HAVE_WINSOCK2_H - #include <winsock2.h> - #endif - + #include <winsock2.h> #include <process.h> #define socket_handle_t SOCKET diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c index 8e1f8dc588..62b4219f10 100644 --- a/wsutil/tempfile.c +++ b/wsutil/tempfile.c @@ -26,11 +26,8 @@ #include <stdlib.h> #include <errno.h> -#ifdef HAVE_WINDOWS_H -#include <windows.h> -#endif - #ifdef _WIN32 +#include <windows.h> #include <process.h> /* For getpid() */ #endif |