Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

This commit is contained in:
Vincent_Michael committed 2013-02-12 21:21:06 +01:00
commit d292b05ac1
18 files changed
+237 -134

No files matched your search

+2 -2
View File
@@ -384,9 +384,9 @@ int WorldSocket::handle_output_queue (GuardType& g)
const size_t send_len = mblk->length();
#ifdef MSG_NOSIGNAL
ssize_t n = peer().send (mblk->rd_ptr(), send_len, MSG_NOSIGNAL);
ssize_t n = peer().send(mblk->rd_ptr(), send_len, MSG_NOSIGNAL);
#else
ssize_t n = peer().send (mblk->rd_ptr(), send_len);
ssize_t n = peer().send(mblk->rd_ptr(), send_len);
#endif // MSG_NOSIGNAL
if (n == 0)