Include winsock2.h before windows.h to please the compiler

windows.h display a warning if winsock2.h isn't included first.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3b3f3345efd24762ed9e9653d7af910ddb1aff6..e18d06d96a406a4f2d58797a62b6a4d1f55ec9f7 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,6 +129,7 @@ TARGET_LINK_LIBRARIES(sarg m)
 
 # Windows need lib wsock32 and ws2_32
 IF(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+   CHECK_INCLUDE_FILE(winsock2.h HAVE_WINSOCK2_H)
    CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H)
    CHECK_INCLUDE_FILE(winsock.h HAVE_WINSOCK_H)
    CHECK_INCLUDE_FILE(ws2tcpip.h HAVE_WS2TCPIP_H)

diff --git a/include/conf.h b/include/conf.h
index 514b5b58cd86a32fbff2c1395f3a2a099521af43..2b89e1ea75dae95b54ca07d2fbaed49fef047649 100755 (executable)
--- a/include/conf.h
+++ b/include/conf.h
@@ -2,6 +2,9 @@
 #include "info.h"
 #include "btree_cache.h"
 
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
 #endif

diff --git a/include/config.h.in b/include/config.h.in
index 9c00b9ad984154cbc49b76b263747ef18840735d..dc57c7f8ee7d41a566d4cb23fcbd38e072bf1523 100644 (file)
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -39,6 +39,7 @@
 #cmakedefine HAVE_LIMITS_H
 #cmakedefine HAVE_WINDOWS_H
 #cmakedefine HAVE_WINSOCK_H
+#cmakedefine HAVE_WINSOCK2_H
 #cmakedefine HAVE_LDAP_H
 #cmakedefine HAVE_MATH_H
 #cmakedefine HAVE_LOCALE_H