From b8db320bf14e327bcd12279871b914d8635ef122 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sat, 4 Mar 2017 18:44:13 +0100
Subject: Core/Misc: Prefix all preprocessor defines from CompilerDefs with
 TRINITY_ to avoid conflicts (PLATFORM_WINDOWS is used/defined by CascLib)

---
 src/tools/connection_patcher/Program.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/tools/connection_patcher/Program.cpp')

diff --git a/src/tools/connection_patcher/Program.cpp b/src/tools/connection_patcher/Program.cpp
index da78a76207a..949365b54ee 100644
--- a/src/tools/connection_patcher/Program.cpp
+++ b/src/tools/connection_patcher/Program.cpp
@@ -31,9 +31,9 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/program_options.hpp>
 
-#if PLATFORM == PLATFORM_WINDOWS
+#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS
 #include <Shlobj.h>
-#elif PLATFORM == PLATFORM_UNIX
+#elif TRINITY_PLATFORM == TRINITY_PLATFORM_UNIX
 #include <pwd.h>
 #endif
 
-- 
cgit v1.2.3