From b9aa10913a445a66e93a9015fb2c3fd845fdd320 Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Thu, 28 Sep 2017 21:20:33 +0200
Subject: [PATCH] Rename internal enum to avoid #define conflicts.

---
 client/TracyProfiler.cpp | 2 +-
 common/TracyQueue.hpp    | 2 +-
 server/TracyView.cpp     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp
index e4479e86..2eaff09d 100755
--- a/client/TracyProfiler.cpp
+++ b/client/TracyProfiler.cpp
@@ -124,7 +124,7 @@ void Profiler::ZoneName( uint64_t id, QueueZoneName&& data )
 void Profiler::FrameMark()
 {
     QueueItem item;
-    item.hdr.type = QueueType::FrameMark;
+    item.hdr.type = QueueType::FrameMarkMsg;
     item.hdr.id = (uint64_t)GetTime();
     s_queue.enqueue( s_token, std::move( item ) );
 }
diff --git a/common/TracyQueue.hpp b/common/TracyQueue.hpp
index 7926d6ff..ddff4431 100755
--- a/common/TracyQueue.hpp
+++ b/common/TracyQueue.hpp
@@ -13,7 +13,7 @@ enum class QueueType : uint8_t
     StringData,
     ThreadName,
     CustomStringData,
-    FrameMark,
+    FrameMarkMsg,
     SourceLocation,
     ZoneText,
     ZoneName,
diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index e8801041..f8fef203 100755
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -239,7 +239,7 @@ void View::Process( const QueueItem& ev )
     case QueueType::ZoneEnd:
         ProcessZoneEnd( ev.hdr.id, ev.zoneEnd );
         break;
-    case QueueType::FrameMark:
+    case QueueType::FrameMarkMsg:
         ProcessFrameMark( ev.hdr.id );
         break;
     case QueueType::SourceLocation: