diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2015-07-13 10:10:12 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2015-07-13 10:10:12 +0200 |
| commit | 067ae38c0aea426219edb11bd188c0798e6a8395 (patch) | |
| tree | bb4fb726f936b315db7b805563df7398c6809bf0 | |
| parent | 6fb2cdbc74c85f266d5d60a8e6194dec1f9c36a3 (diff) | |
| download | mariadb-git-067ae38c0aea426219edb11bd188c0798e6a8395.tar.gz | |
Bug #20168526 YASSL: CORRUPT SSL-KEY CRASHES CLIENT
Post-push fix: broken build on windows.
The problem is min/max macros from windows.h
which interfere with a template function callex max.
Solution: ADD_DEFINITIONS(-DNOMINMAX)
| -rw-r--r-- | cmake/os/Windows.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 54ea3cf95f9..98158ca806b 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -50,10 +50,12 @@ IF(CMAKE_C_COMPILER MATCHES "icl") SET(MSVC TRUE) ENDIF() -ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE") -ADD_DEFINITIONS("-D_WIN32_WINNT=0x0501") +ADD_DEFINITIONS(-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE) +ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501) +# We do not want the windows.h macros min/max +ADD_DEFINITIONS(-DNOMINMAX) # Speed up build process excluding unused header files -ADD_DEFINITIONS("-DWIN32_LEAN_AND_MEAN") +ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN) # Adjust compiler and linker flags IF(MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 4) |