diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-10-04 19:39:09 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-10-04 19:39:09 -0500 |
| commit | f7d3600e7e7ffaba971b77e4371a705e55593cfd (patch) | |
| tree | 2d4e898bb4e09ede5dba97918741597da6fd2d2e /src/server/shared/Common.h | |
| parent | d2437407f4f7ad1af3baeb351626b41bd700065c (diff) | |
| parent | 74707a08d3d63dc66e7b6943431c91f50258b0f9 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
Diffstat (limited to 'src/server/shared/Common.h')
| -rwxr-xr-x | src/server/shared/Common.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h index 259c60ade20..ad0e6dd6437 100755 --- a/src/server/shared/Common.h +++ b/src/server/shared/Common.h @@ -130,14 +130,6 @@ #endif -#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 - inline float finiteAlways(float f) { return finite(f) ? f : 0.0f; } #define atol(a) strtoul( a, NULL, 10) |