aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/server/shared/Utilities/Util.cpp2
-rwxr-xr-xsrc/server/worldserver/Master.cpp8
2 files changed, 2 insertions, 8 deletions
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index 371bd2c7e2b..bd67895ed28 100755
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -18,7 +18,6 @@
#include "Util.h"
-#include "socket_include.h"
#include "utf8.h"
#ifdef USE_SFMT_FOR_RNG
#include "SFMT.h"
@@ -26,6 +25,7 @@
#include "MersenneTwister.h"
#endif
#include <ace/TSS_T.h>
+#include <ace/INET_Addr.h>
#ifdef USE_SFMT_FOR_RNG
typedef ACE_TSS<SFMTRand> SFMTRandTSS;
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 3f376de6f49..158f92cbb89 100755
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -41,12 +41,6 @@
#include "Timer.h"
#include "Util.h"
-#include "TcpSocket.h"
-#include "Utility.h"
-#include "Parse.h"
-#include "Socket.h"
-#include "SocketHandler.h"
-#include "ListenSocket.h"
#include "BigNumber.h"
#ifdef _WIN32
@@ -272,7 +266,7 @@ int Master::Run()
}
///- Launch the world listener socket
- port_t wsport = sWorld.getIntConfig(CONFIG_PORT_WORLD);
+ uint16 wsport = sWorld.getIntConfig(CONFIG_PORT_WORLD);
std::string bind_ip = sConfig.GetStringDefault ("BindIP", "0.0.0.0");
if (sWorldSocketMgr->StartNetwork (wsport, bind_ip.c_str ()) == -1)