diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-20 03:06:03 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-20 03:06:03 +0200 |
| commit | e68d3b0937e205c94c17d7cb1a53194b6d169fe8 (patch) | |
| tree | 326d69976375006fe244df6e858bd20e83fcae90 /src/server/shared/Utilities/Util.cpp | |
| parent | abe8dd7abf70b3589ad0cbba19f91bd4f743bf3e (diff) | |
| parent | 0531f52008cfc4ecb28c0b3cd67504e06452ab75 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
src/server/scripts/Northrend/zone_dalaran.cpp
src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
Diffstat (limited to 'src/server/shared/Utilities/Util.cpp')
| -rw-r--r-- | src/server/shared/Utilities/Util.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index a68d836252d..446ee889c90 100644 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -21,8 +21,15 @@ #include "utf8.h" #include "SFMT.h" #include "Errors.h" // for ASSERT +#include <stdarg.h> #include <boost/thread/tss.hpp> +#if PLATFORM == PLATFORM_UNIX + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +#endif + static boost::thread_specific_ptr<SFMTRand> sfmtRand; static SFMTRand* GetRng() |