diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-20 16:35:35 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-20 16:35:35 +0200 |
| commit | 3b32053c59ed7ca8e3d919b4fe40932795bda365 (patch) | |
| tree | a1afa6ba69dc3920ab98b519b2215d709995cea1 /src/server/shared/Define.h | |
| parent | e108478d623e0a54708ab6ce740492062d8abf5b (diff) | |
| parent | b43a46e449ac019670f1d97d4d62433e90371f5a (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/shared/Utilities/Util.h
Diffstat (limited to 'src/server/shared/Define.h')
| -rw-r--r-- | src/server/shared/Define.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index 8865c70fdf8..2a04b8cdfad 100644 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -21,16 +21,19 @@ #include "CompilerDefs.h" -#include <cstddef> -#include <cinttypes> -#include <climits> - #if COMPILER == COMPILER_GNU # if !defined(__STDC_FORMAT_MACROS) # define __STDC_FORMAT_MACROS # endif +# if !defined(__STDC_CONSTANT_MACROS) +# define __STDC_CONSTANT_MACROS +# endif #endif +#include <cstddef> +#include <cinttypes> +#include <climits> + #define TRINITY_LITTLEENDIAN 0 #define TRINITY_BIGENDIAN 1 |