Rename debug.h to global_define.h, update cmakelists and such

common/CMakeLists.txt

@@ -103,7 +103,6 @@ SET(common_headers
 	data_verification.h
 	database.h
 	dbcore.h
-	debug.h
 	deity.h
 	emu_opcodes.h
 	emu_oplist.h
@@ -133,6 +132,7 @@ SET(common_headers
 	features.h
 	fixed_memory_hash_set.h
 	fixed_memory_variable_hash_set.h
+	global_define.h
 	guild_base.h
 	guilds.h
 	ipc_mutex.h

common/SocketLib/HTTPSocket.cpp

@@ -40,7 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifdef _WIN32
 #pragma warning(disable:4786)
 #endif
-#include "../debug.h"
+#include "../global_define.h"
 #include <stdio.h>
 #include <string>
 #include <stdarg.h>

common/SocketLib/HttpdCookies.cpp

@@ -26,7 +26,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 "../debug.h"
+#include "../global_define.h"
 #ifdef _WIN32
 #pragma warning(disable:4786)
 #endif

common/SocketLib/HttpdSocket.cpp

@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifdef _WIN32
 #pragma warning(disable:4786)
 #endif
-#include "../debug.h"
+#include "../global_define.h"
 #include "Utility.h"
 #include "HttpdCookies.h"
 #include "HttpdForm.h"

common/base_packet.cpp

@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "debug.h"
+#include "global_define.h"
 #include "base_packet.h"
 #include "misc.h"
 #include "packet_dump.h"

common/classes.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/classes.h"
 
 const char* GetEQClassName(uint8 class_, uint8 level) {

common/condition.h

@@ -18,7 +18,7 @@
 #ifndef __CONDITION_H
 #define __CONDITION_H
 
-#include "debug.h"
+#include "global_define.h"
 #include "mutex.h"
 #ifndef WIN32
 #include <pthread.h>

common/crash.cpp

@@ -1,4 +1,4 @@
-#include "debug.h"
+#include "global_define.h"
 #include "eqemu_logsys.h"
 #include "crash.h"
 

common/database.cpp

@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/debug.h"
+#include "../common/global_define.h"
 #include "../common/rulesys.h"
 
 #include <ctype.h>

common/database.h

@@ -21,7 +21,7 @@
 #define AUTHENTICATION_TIMEOUT	60
 #define INVALID_ID				0xFFFFFFFF
 
-#include "debug.h"
+#include "global_define.h"
 #include "eqemu_logsys.h"
 #include "types.h"
 #include "dbcore.h"

common/debug.h

@@ -1,41 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2015 EQEMu Development Team (http://eqemu.org)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#if defined(_DEBUG) && defined(WIN32)
-	#ifndef _CRTDBG_MAP_ALLOC
-		#include <stdlib.h>
-		#include <crtdbg.h>
-	#endif
-#endif
-
-#ifndef EQDEBUG_H
-#define EQDEBUG_H
-
-#define _WINSOCKAPI_	//stupid windows, trying to fix the winsock2 vs. winsock issues
-#if defined(WIN32) && ( defined(PACKETCOLLECTOR) || defined(COLLECTOR) )
-	// Packet Collector on win32 requires winsock.h due to latest pcap.h
-	// winsock.h must come before windows.h
-	#include <winsock.h>
-#endif
-
-#ifdef _WINDOWS
-	#include <windows.h>
-	#include <winsock2.h>
-#endif
-
-#endif

common/emu_opcodes.cpp

@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA
 */
 
-#include "debug.h"
+#include "global_define.h"
 #include "emu_opcodes.h"
 
 const char *OpcodeNames[_maxEmuOpcode+1] = {

common/emu_tcp_connection.cpp

@@ -23,7 +23,7 @@ crap into its own subclass of this object, it will clean things up
 tremendously.
 */
 
-#include "../common/debug.h"
+#include "../common/global_define.h"
 
 #include <iostream>
 #include <string.h>

common/emu_tcp_server.cpp

@@ -1,4 +1,4 @@
-#include "debug.h"
+#include "global_define.h"
 #include "emu_tcp_server.h"
 #include "emu_tcp_connection.h"
 

common/eq_packet.cpp

@@ -17,7 +17,7 @@
 */
 
 #include "crc16.h"
-#include "debug.h"
+#include "global_define.h"
 #include "eq_packet.h"
 #include "misc.h"
 #include "op_codes.h"

common/eq_stream.cpp

@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "debug.h"
+#include "global_define.h"
 #include "eqemu_logsys.h"
 #include "eq_packet.h"
 #include "eq_stream.h"

common/eq_stream_factory.cpp

@@ -1,4 +1,4 @@
-#include "debug.h"
+#include "global_define.h"
 #include "eqemu_logsys.h"
 #include "eq_stream_factory.h"
 

common/eq_stream_ident.cpp

@@ -1,4 +1,4 @@
-#include "debug.h"
+#include "global_define.h"
 #include "eqemu_logsys.h"
 #include "eq_stream_ident.h"
 #include "eq_stream_proxy.h"

common/eq_stream_proxy.cpp

@@ -1,5 +1,5 @@
 
-#include "debug.h"
+#include "global_define.h"
 #include "eq_stream_proxy.h"
 #include "eq_stream.h"
 #include "struct_strategy.h"

common/eqdb.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 "debug.h"
+#include "global_define.h"
 #include "eqdb.h"
 #include "database.h"
 #include <mysql.h>

common/eqdb_res.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 "debug.h"
+#include "global_define.h"
 #include "eqdb_res.h"
 #include <mysql.h>
 

common/eqemu_config.cpp

@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/debug.h"
+#include "../common/global_define.h"
 #include "eqemu_config.h"
 #include "misc_functions.h"
 

common/eqtime.cpp

@@ -17,7 +17,7 @@
 */
 
 #include <fstream>
-#include "../common/debug.h"
+#include "../common/global_define.h"
 #include "../common/eqemu_logsys.h"
 #include "../common/eqtime.h"
 #include "../common/eq_packet_structs.h"

common/extprofile.cpp

@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "debug.h"
+#include "global_define.h"
 #include "extprofile.h"
 
 //Set defaults in the extended profile...

common/guilds.cpp

@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/debug.h"
+#include "../common/global_define.h"
 #include "misc_functions.h"
 #include "guilds.h"
 #include "database.h"

common/item.cpp

@@ -17,7 +17,7 @@
 */
 
 #include "classes.h"
-#include "debug.h"
+#include "global_define.h"
 #include "item.h"
 #include "races.h"
 #include "rulesys.h"

common/misc.cpp

@@ -2,7 +2,7 @@
 	// VS6 doesn't like the length of STL generated names: disabling
 	#pragma warning(disable:4786)
 #endif
-#include "debug.h"
+#include "global_define.h"
 #include <string>
 #include <stdio.h>
 #include <stdlib.h>

common/misc_functions.cpp

@@ -17,7 +17,7 @@
 */
 
 
-#include "../common/debug.h"
+#include "../common/global_define.h"
 #include "misc_functions.h"
 #include <string.h>
 #include <time.h>

common/mutex.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/mutex.h"
 
 #include <iostream>

common/opcode_map.cpp

@@ -1,4 +1,4 @@
-#include "debug.h"
+#include "global_define.h"
 #include <map>
 #include <string>
 

common/packet_dump_file.cpp

@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/debug.h"
+#include "../common/global_define.h"
 
 #include <fstream>
 #include <iomanip>

common/packet_functions.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 <iostream>
 #include <iomanip>
 #include <string.h>

common/patches/patches.cpp

@@ -1,5 +1,5 @@
 
-#include "../debug.h"
+#include "../global_define.h"
 #include "patches.h"
 
 #include "titanium.h"

common/patches/rof.cpp

@@ -1,4 +1,4 @@
-#include "../debug.h"
+#include "../global_define.h"
 #include "../eqemu_logsys.h"
 #include "rof.h"
 #include "../opcodemgr.h"

common/patches/rof2.cpp

@@ -1,4 +1,4 @@
-#include "../debug.h"
+#include "../global_define.h"
 #include "../eqemu_logsys.h"
 #include "rof2.h"
 #include "../opcodemgr.h"

common/patches/sod.cpp

@@ -1,4 +1,4 @@
-#include "../debug.h"
+#include "../global_define.h"
 #include "../eqemu_logsys.h"
 #include "sod.h"
 #include "../opcodemgr.h"

common/patches/sof.cpp

@@ -1,4 +1,4 @@
-#include "../debug.h"
+#include "../global_define.h"
 #include "../eqemu_logsys.h"
 #include "sof.h"
 #include "../opcodemgr.h"

common/patches/titanium.cpp

@@ -1,4 +1,4 @@
-#include "../debug.h"
+#include "../global_define.h"
 #include "../eqemu_logsys.h"
 #include "titanium.h"
 #include "../opcodemgr.h"

common/patches/underfoot.cpp

@@ -1,4 +1,4 @@
-#include "../debug.h"
+#include "../global_define.h"
 #include "../eqemu_logsys.h"
 #include "underfoot.h"
 #include "../opcodemgr.h"

common/perl_eqdb.cpp

@@ -28,7 +28,7 @@
 typedef const char Const_char;
 
 #ifdef EMBPERL
-#include "../common/debug.h"
+#include "../common/global_define.h"
 #include "../common/useperl.h"
 #include "eqdb.h"
 

common/perl_eqdb_res.cpp

@@ -28,7 +28,7 @@
 typedef const char Const_char;
 
 #ifdef EMBPERL
-#include "../common/debug.h"
+#include "../common/global_define.h"
 #include "../common/useperl.h"
 #include "eqdb_res.h"
 

common/proc_launcher.cpp

@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include "debug.h"
+#include "global_define.h"
 #include "types.h"
 #include "proc_launcher.h"
 #ifdef _WINDOWS

common/proc_launcher.h

@@ -18,7 +18,7 @@
 #ifndef PROCLAUNCHER_H_
 #define PROCLAUNCHER_H_
 
-#include "debug.h"
+#include "global_define.h"
 
 #include <string>
 #include <vector>

common/ptimer.cpp

@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "debug.h"
+#include "global_define.h"
 
 #include "timer.h"
 #include "ptimer.h"

common/struct_strategy.cpp

@@ -1,5 +1,5 @@
 
-#include "debug.h"
+#include "global_define.h"
 #include "eqemu_logsys.h"
 #include "struct_strategy.h"
 

common/tcp_connection.cpp

@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/debug.h"
+#include "../common/global_define.h"
 #include "../common/eqemu_logsys.h"
 
 #include <iostream>

common/tcp_server.cpp

@@ -1,4 +1,4 @@
-#include "debug.h"
+#include "global_define.h"
 #include "tcp_server.h"
 #include "../common/eqemu_logsys.h"
 

common/timeoutmgr.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"
 
 //#define TIMEOUT_DEBUG
 

common/timer.h

@@ -22,7 +22,7 @@
 
 // Disgrace: for windows compile
 #ifdef _WINDOWS
-	#include "debug.h"
+	#include "global_define.h"
 	int gettimeofday (timeval *tp, ...);
 #endif
 

common/worldconn.cpp

@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/debug.h"
+#include "../common/global_define.h"
 #include "../common/eqemu_logsys.h"
 #include <iomanip>
 

common/xml_parser.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 "debug.h"
+#include "global_define.h"
 #include "xml_parser.h"
 
 XMLParser::XMLParser() {

common/xml_parser.h

@@ -18,7 +18,7 @@
 #ifndef XMLParser_H
 #define XMLParser_H
 
-#include "debug.h"
+#include "global_define.h"
 #include "tinyxml/tinyxml.h"
 #include "../common/types.h"