diff options
| author | Spp <spp@jorge.gr> | 2012-10-04 13:33:04 +0200 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-10-04 13:33:04 +0200 |
| commit | f570383fbadf12c02d2a3f323eadf5ca2417c3bd (patch) | |
| tree | c28f940c3f77171a5b542189f8704c912001de51 /src/server/shared/Define.h | |
| parent | 94c8c7ec4e3a1cf625bee0bab77f8814253ddf0d (diff) | |
| parent | e1bee86ee6f5c3ab7b1da6d1b54c98c2851f11ec (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellInfo.cpp
Diffstat (limited to 'src/server/shared/Define.h')
| -rwxr-xr-x | src/server/shared/Define.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index 8c1b42af36f..6958634b8ea 100755 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -19,12 +19,12 @@ #ifndef TRINITY_DEFINE_H #define TRINITY_DEFINE_H -#include <sys/types.h> +#include "CompilerDefs.h" #include <ace/Basic_Types.h> #include <ace/ACE_export.h> -#include "CompilerDefs.h" +#include <cstddef> #define TRINITY_LITTLEENDIAN 0 #define TRINITY_BIGENDIAN 1 @@ -70,6 +70,14 @@ # define ATTR_DEPRECATED #endif //COMPILER == COMPILER_GNU +#define UI64FMTD ACE_UINT64_FORMAT_SPECIFIER +#define UI64LIT(N) ACE_UINT64_LITERAL(N) + +#define SI64FMTD ACE_INT64_FORMAT_SPECIFIER +#define SI64LIT(N) ACE_INT64_LITERAL(N) + +#define SIZEFMTD ACE_SIZE_T_FORMAT_SPECIFIER + typedef ACE_INT64 int64; typedef ACE_INT32 int32; typedef ACE_INT16 int16; |