From: Jakub Zakrzewski <jzakrzewski@e2ebridge.com>
Date: Wed, 16 Sep 2015 15:27:13 +0000 (+0200)
Subject: CMake: Put "winsock2.h" before "windows.h" during configure checks
X-Git-Tag: curl-7_45_0~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c478cad57cda3db4819f0ff37c88ee9ed11cad4;p=thirdparty%2Fcurl.git

CMake: Put "winsock2.h" before "windows.h" during configure checks

"windows.h" includes "winsock.h" what causes many redefinition errors
if "winsock2.h" is included afterwards and can cause build to fail.
---

diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake
index 4f07f2251a..d59949871f 100644
--- a/CMake/OtherTests.cmake
+++ b/CMake/OtherTests.cmake
@@ -10,8 +10,8 @@ endmacro(add_header_include)
 
 set(signature_call_conv)
 if(HAVE_WINDOWS_H)
-  add_header_include(HAVE_WINDOWS_H "windows.h")
   add_header_include(HAVE_WINSOCK2_H "winsock2.h")
+  add_header_include(HAVE_WINDOWS_H "windows.h")
   add_header_include(HAVE_WINSOCK_H "winsock.h")
   set(_source_epilogue
       "${_source_epilogue}\n#ifndef WIN32_LEAN_AND_MEAN\n#define WIN32_LEAN_AND_MEAN\n#endif")