From 6fe36efe0f2a05421965ad57c69b2f950a2cdb72 Mon Sep 17 00:00:00 2001 From: Rat Date: Sun, 20 Dec 2009 15:20:04 +0100 Subject: *apply trinity style to whole source *comment out all mangos to trinity defines *this will make merging a little harder, but code will be more clear --HG-- branch : trunk --- src/framework/Platform/Define.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/framework/Platform') diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h index 9536098258a..95e7c0d7b66 100644 --- a/src/framework/Platform/Define.h +++ b/src/framework/Platform/Define.h @@ -137,10 +137,14 @@ typedef uint32 DWORD; typedef uint64 OBJECT_HANDLE; -#define MaNGOS Trinity -#define MANGOS_DLL_DECL TRINITY_DLL_DECL -#define MANGOS_DLL_SPEC TRINITY_DLL_SPEC -#define GetMangosString GetTrinityString +//commented out +//so all future merges with invalid style will drop build errors +//this way devs will at least read thru what they merge to find the error + +//#define MaNGOS Trinity +//#define MANGOS_DLL_DECL TRINITY_DLL_DECL +//#define MANGOS_DLL_SPEC TRINITY_DLL_SPEC +//#define GetMangosString GetTrinityString #if defined(MANGOS_DEBUG) || defined(TRINITY_DEBUG) # ifndef TRINITY_DEBUG -- cgit v1.2.3