Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Prefix all preprocessor defines from CompilerDefs with TRINITY_ to avoid conflicts (PLATFORM_WINDOWS is used/defined by CascLib)

Browse Source
This commit is contained in:
Shauren
2017-03-04 18:44:13 +01:00
parent 61829e269e
commit b8db320bf1
23 changed files with 67 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/Debugging/Errors.h
View File

@@ -38,7 +38,7 @@ namespace Trinity
} // namespace Trinity
#if COMPILER == COMPILER_MICROSOFT
#if TRINITY_COMPILER == TRINITY_COMPILER_MICROSOFT
#define ASSERT_BEGIN __pragma(warning(push)) __pragma(warning(disable: 4127))
#define ASSERT_END __pragma(warning(pop))
#else

2
src/common/Debugging/WheatyExceptionReport.cpp
View File

@@ -5,7 +5,7 @@
//==========================================
#include "CompilerDefs.h"
#if PLATFORM == PLATFORM_WINDOWS && !defined(__MINGW32__)
#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS && !defined(__MINGW32__)
#define WIN32_LEAN_AND_MEAN
#pragma warning(disable:4996)
#pragma warning(disable:4312)

2
src/common/Debugging/WheatyExceptionReport.h
View File

@@ -1,7 +1,7 @@
#ifndef _WHEATYEXCEPTIONREPORT_
#define _WHEATYEXCEPTIONREPORT_
#if PLATFORM == PLATFORM_WINDOWS && !defined(__MINGW32__)
#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS && !defined(__MINGW32__)
#include <winnt.h>
#include <winternl.h>