From 51bdb004f9a16b813c9794b8b898e16ca5d69e06 Mon Sep 17 00:00:00 2001
From: Miguel Fernandez <muit@piperift.com>
Date: Mon, 24 Dec 2018 15:26:50 +0000
Subject: [PATCH 1/2] Avoid conflicts with min/max macros

---
 client/TracyProfiler.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp
index 6d50aebb..ecbb18a0 100644
--- a/client/TracyProfiler.cpp
+++ b/client/TracyProfiler.cpp
@@ -1,5 +1,9 @@
 #ifdef TRACY_ENABLE
 
+#ifndef NOMINMAX
+	#define NOMINMAX
+#endif
+
 #ifdef _MSC_VER
 #  include <winsock2.h>
 #  include <windows.h>

From 7c164375a4ed4cc8057bf127c71e170b92774363 Mon Sep 17 00:00:00 2001
From: Miguel Fernandez <muit@piperift.com>
Date: Mon, 24 Dec 2018 18:49:53 +0000
Subject: [PATCH 2/2] Moved NoMinMax inside _MSC_VER

---
 client/TracyProfiler.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp
index ecbb18a0..53f71078 100644
--- a/client/TracyProfiler.cpp
+++ b/client/TracyProfiler.cpp
@@ -1,13 +1,12 @@
 #ifdef TRACY_ENABLE
 
-#ifndef NOMINMAX
-	#define NOMINMAX
-#endif
-
 #ifdef _MSC_VER
 #  include <winsock2.h>
 #  include <windows.h>
 #  include <tlhelp32.h>
+#  ifndef NOMINMAX
+#    define NOMINMAX
+#  endif
 #else
 #  include <sys/time.h>
 #endif