pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-11 19:32:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Linux compiles

Browse Source
This commit is contained in:
Akkadius 2015-01-20 03:07:33 -06:00
parent b2ffcf1cf6
commit e79c1c1a5a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/eqemu_logsys.h
View File

@ -156,9 +156,9 @@ private:
uint16 GetWindowsConsoleColorFromCategory(uint16 log_category); uint16 GetWindowsConsoleColorFromCategory(uint16 log_category);
std::string GetLinuxConsoleColorFromCategory(uint16 log_category); std::string GetLinuxConsoleColorFromCategory(uint16 log_category);
void ProcessConsoleMessage(uint16 log_category, const std::string message); void ProcessConsoleMessage(uint16 debug_level, uint16 log_category, const std::string message);
void ProcessGMSay(uint16 log_category, std::string message); void ProcessGMSay(uint16 debug_level, uint16 log_category, std::string message);
void ProcessLogWrite(uint16 log_category, std::string message); void ProcessLogWrite(uint16 debug_level, uint16 log_category, std::string message);
}; };
extern EQEmuLogSys Log; extern EQEmuLogSys Log;

4
common/tcp_connection.cpp
View File

@ -899,7 +899,7 @@ ThreadReturnType TCPConnection::TCPConnectionLoop(void* tmp) {
} }
TCPConnection* tcpc = (TCPConnection*) tmp; TCPConnection* tcpc = (TCPConnection*) tmp;
#ifndef WIN32 #ifndef WIN32
Log.Out(Logs::Detail, Logs::TCP_Connection, __FUNCTION__ " Starting TCPConnectionLoop with thread ID %d", pthread_self()); Log.Out(Logs::Detail, Logs::TCP_Connection, "%s Starting TCPConnectionLoop with thread ID %d", __FUNCTION__, pthread_self());
#endif #endif
tcpc->MLoopRunning.lock(); tcpc->MLoopRunning.lock();
while (tcpc->RunLoop()) { while (tcpc->RunLoop()) {
@ -926,7 +926,7 @@ ThreadReturnType TCPConnection::TCPConnectionLoop(void* tmp) {
tcpc->MLoopRunning.unlock(); tcpc->MLoopRunning.unlock();
#ifndef WIN32 #ifndef WIN32
Log.Out(Logs::Detail, Logs::TCP_Connection, __FUNCTION__ "Ending TCPConnectionLoop with thread ID %d", pthread_self()); Log.Out(Logs::Detail, Logs::TCP_Connection, "%s Ending TCPConnectionLoop with thread ID %d", __FUNCTION__, pthread_self());
#endif #endif
THREAD_RETURN(nullptr); THREAD_RETURN(nullptr);