From 44132be7164b95a99c9463c62afc13457eb03a07 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 28 May 2018 10:19:10 -0700 Subject: [PATCH] avoid MSVC min()/max() conflict --- configure/CONFIG_SITE | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index dc691b0..2d9c5e9 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -23,6 +23,9 @@ CHECK_RELEASE = YES -include $(TOP)/../CONFIG_SITE.local -include $(TOP)/configure/CONFIG_SITE.local +# MSVC - skip defining min()/max() macros +USR_CPPFLAGS_WIN32 += -DNOMINMAX + ifdef WITH_COVERAGE USR_CPPFLAGS += --coverage USR_LDFLAGS += --coverage