From 707f113bda6092a030a0c944e7de05bbe69de831 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Thu, 10 Oct 2019 20:29:06 +0200 Subject: [PATCH] Add missing NOMINMAX definitions. --- client/TracyCallstack.cpp | 3 +++ client/TracySysTrace.cpp | 4 ++++ common/TracySocket.cpp | 3 +++ 3 files changed, 10 insertions(+) diff --git a/client/TracyCallstack.cpp b/client/TracyCallstack.cpp index f89e14a3..7ae6cf3b 100644 --- a/client/TracyCallstack.cpp +++ b/client/TracyCallstack.cpp @@ -5,6 +5,9 @@ #ifdef TRACY_HAS_CALLSTACK #if TRACY_HAS_CALLSTACK == 1 +# ifndef NOMINMAX +# define NOMINMAX +# endif # include # ifdef _MSC_VER # pragma warning( push ) diff --git a/client/TracySysTrace.cpp b/client/TracySysTrace.cpp index 0c508aa6..4fd62811 100644 --- a/client/TracySysTrace.cpp +++ b/client/TracySysTrace.cpp @@ -4,6 +4,10 @@ # if defined _WIN32 || defined __CYGWIN__ +# ifndef NOMINMAX +# define NOMINMAX +# endif + # define INITGUID # include # include diff --git a/common/TracySocket.cpp b/common/TracySocket.cpp index fdf6c65a..2643b8a6 100644 --- a/common/TracySocket.cpp +++ b/common/TracySocket.cpp @@ -10,6 +10,9 @@ #include "TracySocket.hpp" #ifdef _WIN32 +# ifndef NOMINMAX +# define NOMINMAX +# endif # include # include # ifdef _MSC_VER