]> granicus.if.org Git - curl/commitdiff
CMake: Put "winsock2.h" before "windows.h" during configure checks
authorJakub Zakrzewski <jzakrzewski@e2ebridge.com>
Wed, 16 Sep 2015 15:27:13 +0000 (17:27 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Wed, 23 Sep 2015 13:18:38 +0000 (15:18 +0200)
"windows.h" includes "winsock.h" what causes many redefinition errors
if "winsock2.h" is included afterwards and can cause build to fail.

CMake/OtherTests.cmake

index 4f07f2251ab115b78efb269a6924a850ca9c34ef..d59949871f80b6ce0ab6f8acdd7764a553b3509f 100644 (file)
@@ -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")