diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h
index 562b86023..03d90279c 100644
--- a/src/server/shared/Define.h
+++ b/src/server/shared/Define.h
@@ -26,6 +26,10 @@
 
 #include <cstddef>
 
+#if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
+#define OS_WIN
+#endif
+
 #define TRINITY_LITTLEENDIAN 0
 #define TRINITY_BIGENDIAN    1
 
diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index 427a8a0b0..d3568688d 100644
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -376,7 +376,12 @@ class ByteBuffer
             lt.tm_mon = (packedDate >> 20) & 0xF;
             lt.tm_year = ((packedDate >> 24) & 0x1F) + 100;
 
-            return uint32(mktime(&lt) + _timezone);
+            #ifdef OS_WIN
+                return uint32(mktime(&lt) + _timezone);
+            #else
+                return uint32(mktime(&lt) + timezone);
+            #endif
+
         }
 
         ByteBuffer& ReadPackedTime(uint32& time)