diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-03 10:25:38 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-03 10:25:38 +0300 |
commit | 186a998b5b932851d64666c92e3062c9e997e77b (patch) | |
tree | 606b064a57936b2e6f10e0b396ed6d5165a6d419 /cmake | |
parent | c3289d27eef39a47fed2ce1ff239013ed6870f39 (diff) | |
parent | 400cf017152c732387c89deaa082b43c8fb42d71 (diff) | |
download | mariadb-git-186a998b5b932851d64666c92e3062c9e997e77b.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/os/Windows.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index da7dd3180a3..0caa67b20ab 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -47,7 +47,7 @@ IF(CMAKE_C_COMPILER MATCHES "icl") ENDIF() ADD_DEFINITIONS(-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE) -ADD_DEFINITIONS(-D_WIN32_WINNT=0x0600) +ADD_DEFINITIONS(-D_WIN32_WINNT=0x0A00) # We do not want the windows.h macros min/max ADD_DEFINITIONS(-DNOMINMAX) # Speed up build process excluding unused header files |