diff options
| author | Spp <spp@jorge.gr> | 2012-11-09 14:26:27 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-09 14:26:27 +0100 |
| commit | c51380690ffeb82c1c75d3981c424612c0f2bc9f (patch) | |
| tree | 9b2b90379ceac9d6c0bdb97a744d10a49959a445 /src/server/authserver/Server/RealmSocket.h | |
| parent | ccf593c6738ad1073381f1c2d404664e8d4ea187 (diff) | |
| parent | 333b8e5159ada2f1b8cbfd1dd8eb9072754477d7 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/DataStores/DBCEnums.h
src/server/game/Handlers/PetHandler.cpp
src/server/game/Server/WorldSession.h
Diffstat (limited to 'src/server/authserver/Server/RealmSocket.h')
| -rwxr-xr-x | src/server/authserver/Server/RealmSocket.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/authserver/Server/RealmSocket.h b/src/server/authserver/Server/RealmSocket.h index c03a0e3ad1e..b093691047c 100755 --- a/src/server/authserver/Server/RealmSocket.h +++ b/src/server/authserver/Server/RealmSocket.h @@ -59,7 +59,7 @@ public: virtual int open(void *); - virtual int close(int); + virtual int close(u_long); virtual int handle_input(ACE_HANDLE = ACE_INVALID_HANDLE); virtual int handle_output(ACE_HANDLE = ACE_INVALID_HANDLE); |