From 65397cf03e41176ec8ae50f86248d93d6824fa46 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Thu, 22 Jan 2015 16:48:10 -0600 Subject: [PATCH] Compile fix for Loginserver --- loginserver/client.h | 2 +- loginserver/client_manager.h | 2 +- loginserver/config.cpp | 2 +- loginserver/database_mysql.cpp | 2 +- loginserver/database_postgresql.cpp | 2 +- loginserver/encryption.cpp | 2 +- loginserver/main.cpp | 4 ++-- loginserver/server_manager.h | 2 +- loginserver/world_server.h | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/loginserver/client.h b/loginserver/client.h index 784b0ba4f..b20e5ae91 100644 --- a/loginserver/client.h +++ b/loginserver/client.h @@ -18,7 +18,7 @@ #ifndef EQEMU_CLIENT_H #define EQEMU_CLIENT_H -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/opcodemgr.h" #include "../common/eq_stream_type.h" #include "../common/eq_stream_factory.h" diff --git a/loginserver/client_manager.h b/loginserver/client_manager.h index 4c3920f04..dc7637776 100644 --- a/loginserver/client_manager.h +++ b/loginserver/client_manager.h @@ -18,7 +18,7 @@ #ifndef EQEMU_CLIENTMANAGER_H #define EQEMU_CLIENTMANAGER_H -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/opcodemgr.h" #include "../common/eq_stream_type.h" #include "../common/eq_stream_factory.h" diff --git a/loginserver/config.cpp b/loginserver/config.cpp index 8815622d2..96a4c8568 100644 --- a/loginserver/config.cpp +++ b/loginserver/config.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "config.h" #include "error_log.h" diff --git a/loginserver/database_mysql.cpp b/loginserver/database_mysql.cpp index 924538f38..9cf08563b 100644 --- a/loginserver/database_mysql.cpp +++ b/loginserver/database_mysql.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "database.h" #ifdef EQEMU_MYSQL_ENABLED diff --git a/loginserver/database_postgresql.cpp b/loginserver/database_postgresql.cpp index e57679f64..3dc20d3f3 100644 --- a/loginserver/database_postgresql.cpp +++ b/loginserver/database_postgresql.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "database.h" #ifdef EQEMU_POSTGRESQL_ENABLED diff --git a/loginserver/encryption.cpp b/loginserver/encryption.cpp index 5585487b1..b00f5e88b 100644 --- a/loginserver/encryption.cpp +++ b/loginserver/encryption.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "encryption.h" #include "error_log.h" #include diff --git a/loginserver/main.cpp b/loginserver/main.cpp index 31941b800..0d51a69ff 100644 --- a/loginserver/main.cpp +++ b/loginserver/main.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/types.h" #include "../common/opcodemgr.h" #include "../common/eq_stream_factory.h" @@ -31,7 +31,7 @@ TimeoutManager timeout_manager; LoginServer server; -EQEmuLogSys logger; +EQEmuLogSys Log; ErrorLog *server_log; bool run_server = true; diff --git a/loginserver/server_manager.h b/loginserver/server_manager.h index e2453701d..6f9db9afa 100644 --- a/loginserver/server_manager.h +++ b/loginserver/server_manager.h @@ -18,7 +18,7 @@ #ifndef EQEMU_SERVERMANAGER_H #define EQEMU_SERVERMANAGER_H -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eq_stream_factory.h" #include "../common/emu_tcp_connection.h" #include "../common/emu_tcp_server.h" diff --git a/loginserver/world_server.h b/loginserver/world_server.h index ff790e103..0d8ed4251 100644 --- a/loginserver/world_server.h +++ b/loginserver/world_server.h @@ -18,7 +18,7 @@ #ifndef EQEMU_WORLDSERVER_H #define EQEMU_WORLDSERVER_H -#include "../common/debug.h" +#include "../common/global_define.h" #include "../common/eq_stream_factory.h" #include "../common/emu_tcp_connection.h" #include "../common/emu_tcp_server.h"