diff options
| author | mik1893 <michele.roscelli@gmail.com> | 2016-06-29 08:10:12 +0100 |
|---|---|---|
| committer | Yehonal <hw.2@hotmail.it> | 2016-07-08 23:54:30 +0200 |
| commit | 741bbd3109216af01cd87566db6fa49db8409f3e (patch) | |
| tree | 295d97a1bea1c71cc83f559104d80018f53ad16b /src | |
| parent | 13d8210867e62178604d3332b7fa11ad03d882be (diff) | |
Fix Unix/Windows Compile (timezone issue)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/shared/Define.h | 4 | ||||
| -rw-r--r-- | src/server/shared/Packets/ByteBuffer.h | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index 562b86023f..03d90279cc 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 427a8a0b02..d3568688d0 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(<) + _timezone); + #ifdef OS_WIN + return uint32(mktime(<) + _timezone); + #else + return uint32(mktime(<) + timezone); + #endif + } ByteBuffer& ReadPackedTime(uint32& time) |