aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Zakrzewski <jzakrzewski@e2ebridge.com>2015-09-16 17:27:13 +0200
committerDaniel Stenberg <daniel@haxx.se>2015-09-23 15:18:38 +0200
commit7c478cad57cda3db4819f0ff37c88ee9ed11cad4 (patch)
tree43153e5296a27b43f8a272a2a56da6691e8fefd2
parent0110cced2a44a0c89fd5f98c30e80afeb208c0e0 (diff)
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.
-rw-r--r--CMake/OtherTests.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake
index 4f07f2251..d59949871 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")