diff options
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 |