Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/shared/Utilities/Util.h

3 files changed, 8 insertions, 16 deletions

diff --git a/src/server/shared/Debugging/Errors.cpp b/src/server/shared/Debugging/Errors.cpp
index 62e97d56d42..0621cfa5b6d 100644
--- a/src/server/shared/Debugging/Errors.cpp
+++ b/src/server/shared/Debugging/Errors.cpp
@@ -18,6 +18,7 @@
 
 #include "Errors.h"
 
+#include <cstdio>
 #include <cstdlib>
 #include <thread>
 
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
 
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h
index 6fc5dcfdc2b..2a776715521 100644
--- a/src/server/shared/Utilities/Util.h
+++ b/src/server/shared/Utilities/Util.h
@@ -353,11 +353,6 @@ uint32 CreatePIDFile(const std::string& filename);
 
 std::string ByteArrayToHexStr(uint8 const* bytes, uint32 length, bool reverse = false);
 void HexStrToByteArray(std::string const& str, uint8* out, bool reverse = false);
-#endif
-
-//handler for operations on large flags
-#ifndef _FLAG96
-#define _FLAG96
 
 // simple class for not-modifyable list
 template <typename T>
@@ -404,13 +399,6 @@ public:
         part[2] = p3;
     }
 
-    flag96(uint64 p1, uint32 p2)
-    {
-        part[0] = (uint32)(p1 & UI64LIT(0x00000000FFFFFFFF));
-        part[1] = (uint32)((p1 >> 32) & UI64LIT(0x00000000FFFFFFFF));
-        part[2] = p2;
-    }
-
     inline bool IsEqual(uint32 p1 = 0, uint32 p2 = 0, uint32 p3 = 0) const
     {
         return (part[0] == p1 && part[1] == p2 && part[2] == p3);