From 6c8a8007e485c8ee5456de01a78b1031a25628ec Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 6 Nov 2013 15:34:53 -0800 Subject: [PATCH] best practice: lways define NOMINMAX when including windows.h --- src/plugin.cpp | 1 + src/utils.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugin.cpp b/src/plugin.cpp index ca8b09567..dc7eb8eec 100644 --- a/src/plugin.cpp +++ b/src/plugin.cpp @@ -24,6 +24,7 @@ #include #ifdef _WINDOWS + #define NOMINMAX #include #define handle HMODULE #define dlsym GetProcAddress diff --git a/src/utils.cpp b/src/utils.cpp index a10102889..668a0bf05 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -25,7 +25,7 @@ #include #include #include - +#define NOMINMAX #include namespace mapnik {