diff --git a/common/MiscFunctions.cpp b/common/MiscFunctions.cpp index f6cd00e63..e6089dfba 100644 --- a/common/MiscFunctions.cpp +++ b/common/MiscFunctions.cpp @@ -38,9 +38,6 @@ using namespace std; #include #define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif #define strncasecmp _strnicmp #define strcasecmp _stricmp #else diff --git a/common/TCPConnection.h b/common/TCPConnection.h index d2f942c5e..1715ce04d 100644 --- a/common/TCPConnection.h +++ b/common/TCPConnection.h @@ -24,9 +24,6 @@ #ifdef _WINDOWS #define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif #define strncasecmp _strnicmp #define strcasecmp _stricmp diff --git a/common/debug.cpp b/common/debug.cpp index 5d906aeb4..e6d290fa2 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -10,9 +10,6 @@ using namespace std; #include #define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif #define strncasecmp _strnicmp #define strcasecmp _stricmp #else diff --git a/common/debug.h b/common/debug.h index 62641f53a..b7f0847c0 100644 --- a/common/debug.h +++ b/common/debug.h @@ -1,5 +1,5 @@ /* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) + Copyright (C) 2001-2013 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 @@ -45,22 +45,9 @@ #ifndef _CRTDBG_MAP_ALLOC #include #include - #if (_MSC_VER < 1300) - #include - #include - #define _CRTDBG_MAP_ALLOC - #define new new(_NORMAL_BLOCK, __FILE__, __LINE__) - #define malloc(s) _malloc_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__) - #endif #endif #endif -#ifdef _WINDOWS - // VS6 doesn't like the length of STL generated names: disabling - #pragma warning(disable:4786) - #pragma warning(disable:4996) -#endif - #ifndef EQDEBUG_H #define EQDEBUG_H @@ -82,6 +69,7 @@ #include "logsys.h" #include "common_profile.h" + #ifdef ZONE #include "../zone/zone_profile.h" #endif @@ -160,5 +148,7 @@ public: LARGE_INTEGER tmp; int64* p; }; + #endif -#endif + +#endif \ No newline at end of file diff --git a/common/packet_dump_file.cpp b/common/packet_dump_file.cpp index e02de9348..85b0075fd 100644 --- a/common/packet_dump_file.cpp +++ b/common/packet_dump_file.cpp @@ -29,9 +29,6 @@ #ifdef _WINDOWS #define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif #define strncasecmp _strnicmp #define strcasecmp _stricmp #else diff --git a/common/types.h b/common/types.h index db5cd49d0..16019ba86 100644 --- a/common/types.h +++ b/common/types.h @@ -68,9 +68,6 @@ typedef const char Const_char; //for perl XS #ifdef _WINDOWS #define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif #define strncasecmp _strnicmp #define strcasecmp _stricmp typedef void ThreadReturnType; diff --git a/world/LoginServer.cpp b/world/LoginServer.cpp index bb1c671da..00855edb8 100644 --- a/world/LoginServer.cpp +++ b/world/LoginServer.cpp @@ -31,9 +31,6 @@ using namespace std; #include #define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif #define strncasecmp _strnicmp #define strcasecmp _stricmp #else // Pyro: fix for linux diff --git a/world/client.cpp b/world/client.cpp index f082a22e7..3b162c6d9 100644 --- a/world/client.cpp +++ b/world/client.cpp @@ -20,9 +20,6 @@ using namespace std; #include #include #define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif #define strncasecmp _strnicmp #define strcasecmp _stricmp #else diff --git a/world/console.cpp b/world/console.cpp index d6b1a2414..103a5c7e3 100644 --- a/world/console.cpp +++ b/world/console.cpp @@ -49,9 +49,6 @@ using namespace std; #ifdef _WINDOWS #define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif #define strncasecmp _strnicmp #define strcasecmp _stricmp #endif diff --git a/world/net.cpp b/world/net.cpp index 4be92a893..3a7639f52 100644 --- a/world/net.cpp +++ b/world/net.cpp @@ -47,9 +47,6 @@ using namespace std; #ifdef _WINDOWS #include #define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif #define strncasecmp _strnicmp #define strcasecmp _stricmp #include diff --git a/zone/PlayerCorpse.cpp b/zone/PlayerCorpse.cpp index 6e4fb74f3..79a44e2fe 100644 --- a/zone/PlayerCorpse.cpp +++ b/zone/PlayerCorpse.cpp @@ -28,12 +28,9 @@ Child of the Mob class. #include using namespace std; #ifdef _WINDOWS -#define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif -#define strncasecmp _strnicmp -#define strcasecmp _stricmp + #define snprintf _snprintf + #define strncasecmp _strnicmp + #define strcasecmp _stricmp #endif #include "masterentity.h" diff --git a/zone/beacon.cpp b/zone/beacon.cpp index 5ed82f8a8..5d5d56480 100644 --- a/zone/beacon.cpp +++ b/zone/beacon.cpp @@ -25,12 +25,9 @@ target to center around. #include "../common/debug.h" #ifdef _WINDOWS -#define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif -#define strncasecmp _strnicmp -#define strcasecmp _stricmp + #define snprintf _snprintf + #define strncasecmp _strnicmp + #define strcasecmp _stricmp #endif #include "masterentity.h" diff --git a/zone/client.cpp b/zone/client.cpp index 04f15841c..ff2c767b7 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -28,19 +28,16 @@ using namespace std; // for windows compile #ifdef _WINDOWS -#define abs64 _abs64 -#define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif -#define strncasecmp _strnicmp -#define strcasecmp _stricmp + #define abs64 _abs64 + #define snprintf _snprintf + #define strncasecmp _strnicmp + #define strcasecmp _stricmp #else -#include -#include -#include -#include "../common/unix.h" -#define abs64 abs + #include + #include + #include + #include "../common/unix.h" + #define abs64 abs #endif extern volatile bool RunLoops; diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 731f10f47..56296eee4 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -29,9 +29,6 @@ #ifdef _WINDOWS #define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif #define strncasecmp _strnicmp #define strcasecmp _stricmp #else diff --git a/zone/client_process.cpp b/zone/client_process.cpp index 597684aa1..9b278e57f 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -32,9 +32,6 @@ #include #include #define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif #define strncasecmp _strnicmp #define strcasecmp _stricmp #else diff --git a/zone/entity.cpp b/zone/entity.cpp index 6026329fd..9429772f7 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -49,12 +49,9 @@ using namespace std; #include "QuestParserCollection.h" #ifdef _WINDOWS -#define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif -#define strncasecmp _strnicmp -#define strcasecmp _stricmp + #define snprintf _snprintf + #define strncasecmp _strnicmp + #define strcasecmp _stricmp #endif extern Zone* zone; diff --git a/zone/net.cpp b/zone/net.cpp index e7d7ddf1c..65a698009 100644 --- a/zone/net.cpp +++ b/zone/net.cpp @@ -33,14 +33,12 @@ using namespace std; #define new new(_NORMAL_BLOCK, __FILE__, __LINE__) #endif using namespace std; + #ifdef _WINDOWS -#include -#define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif -#define strncasecmp _strnicmp -#define strcasecmp _stricmp + #include + #define snprintf _snprintf + #define strncasecmp _strnicmp + #define strcasecmp _stricmp #endif volatile bool RunLoops = true; diff --git a/zone/petitions.cpp b/zone/petitions.cpp index 13954df17..ef3a9f113 100644 --- a/zone/petitions.cpp +++ b/zone/petitions.cpp @@ -28,12 +28,9 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) #endif #ifdef _WINDOWS -#define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif -#define strncasecmp _strnicmp -#define strcasecmp _stricmp + #define snprintf _snprintf + #define strncasecmp _strnicmp + #define strcasecmp _stricmp #endif #include "../common/packet_functions.h" #include "../common/packet_dump.h" diff --git a/zone/tribute.cpp b/zone/tribute.cpp index acfab14f0..ce6695c40 100644 --- a/zone/tribute.cpp +++ b/zone/tribute.cpp @@ -27,16 +27,13 @@ using namespace std; #ifdef _WINDOWS -#include -#include -#include + #include + #include + #include -#define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif -#define strncasecmp _strnicmp -#define strcasecmp _stricmp + #define snprintf _snprintf + #define strncasecmp _strnicmp + #define strcasecmp _stricmp #else #include #include diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index c25af347e..1ce93b078 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -29,9 +29,6 @@ using namespace std; #include #define snprintf _snprintf -#if (_MSC_VER < 1500) - #define vsnprintf _vsnprintf -#endif #define strncasecmp _strnicmp #define strcasecmp _stricmp #endif