diff options
| author | Rat <none@none> | 2009-12-20 15:20:04 +0100 |
|---|---|---|
| committer | Rat <none@none> | 2009-12-20 15:20:04 +0100 |
| commit | 6fe36efe0f2a05421965ad57c69b2f950a2cdb72 (patch) | |
| tree | d8377347f5ae67a042d37b52b4eabf2bd4aa32bf /src/framework | |
| parent | baa264e6150700e54a9ba6995d16a6d5af2c0dee (diff) | |
*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
Diffstat (limited to 'src/framework')
| -rw-r--r-- | src/framework/Platform/Define.h | 12 |
1 files changed, 8 insertions, 4 deletions
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 |