diff options
| author | click <none@none> | 2010-08-22 01:57:04 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-08-22 01:57:04 +0200 |
| commit | 670964803f030c6d2b85d4281605ab221f5a5740 (patch) | |
| tree | 5babaf3c1c2f7833bf2be8b10a1f7bec78722751 /src/server/shared/Define.h | |
| parent | a40cb46e610aefde8b270b34e9b510e76470a6b6 (diff) | |
Core: Fix more warnings, add new function sLog.outStaticDebug() that replaces DEBUG_LOG
--HG--
branch : trunk
Diffstat (limited to 'src/server/shared/Define.h')
| -rw-r--r-- | src/server/shared/Define.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index 980cf9023e1..ebef4649288 100644 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -49,14 +49,14 @@ # define DECLSPEC_NORETURN #endif //PLATFORM -#if !defined(DEBUG) +#if !defined(COREDEBUG) # define TRINITY_INLINE inline -#else //DEBUG +#else //COREDEBUG # if !defined(TRINITY_DEBUG) # define TRINITY_DEBUG # endif //TRINITY_DEBUG # define TRINITY_INLINE -#endif //!DEBUG +#endif //!COREDEBUG #if COMPILER == COMPILER_GNU # define ATTR_NORETURN __attribute__((noreturn)) @@ -75,11 +75,4 @@ typedef ACE_UINT32 uint32; typedef ACE_UINT16 uint16; typedef ACE_UINT8 uint8; -#if COMPILER != COMPILER_MICROSOFT -typedef uint16 WORD; -typedef uint32 DWORD; -#endif //COMPILER - -typedef uint64 OBJECT_HANDLE; - #endif //TRINITY_DEFINE_H |