From 112989153243a2885226adb2be58aae2e26da907 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 19 Jan 2014 00:23:23 +0100 Subject: [PATCH] NOMINMAX fix after removal of some classes https://dev.vatsim-germany.org/boards/22/topics/1417?r=1440#message-1440 --- src/blackcore/voice_vatlib.h | 5 ++++- src/blackmisc/context.cpp | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/blackcore/voice_vatlib.h b/src/blackcore/voice_vatlib.h index dab8e02d8..ec10a70a3 100644 --- a/src/blackcore/voice_vatlib.h +++ b/src/blackcore/voice_vatlib.h @@ -14,7 +14,10 @@ #include #include -#if defined(Q_OS_WIN) +#ifdef Q_OS_WIN +#ifndef NOMINMAX +#define NOMINMAX +#endif #include #endif diff --git a/src/blackmisc/context.cpp b/src/blackmisc/context.cpp index ccc947d33..240fe6bf6 100644 --- a/src/blackmisc/context.cpp +++ b/src/blackmisc/context.cpp @@ -8,8 +8,10 @@ #include #include - #ifdef Q_OS_WIN +#ifndef NOMINMAX +#define NOMINMAX +#endif #include #endif