diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-08-08 13:53:43 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-08 13:53:43 +0200 |
| commit | 9fffe990c436444fb6b214a789ede0ca938b7b31 (patch) | |
| tree | c90e755745d46fdf8ecc4465bca9ea6abb06afc4 /config.h.cmake | |
| parent | ffd9c77e080ce570217bf517b9ea3b4c07fe5f8e (diff) | |
| download | mariadb-git-9fffe990c436444fb6b214a789ede0ca938b7b31.tar.gz | |
buildbot found failures
config.h.cmake:
define NOMINMAX, otherwise Windows system headers define min() and max() macros
sql/slave.cc:
mi->report() has one more argument in MariaDB
storage/xtradb/buf/buf0flu.cc:
xtradb fixes for windows, again
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config.h.cmake b/config.h.cmake index c48d17fada0..8faf887730a 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -520,6 +520,11 @@ #endif #define PSAPI_VERSION 1 /* for GetProcessMemoryInfo() */ +/* We don't want the min/max macros */ +#ifdef __WIN__ +#define NOMINMAX +#endif + /* MySQL features */ |