Removed the _MSC_VER special cases for Visual Studio 2008 and lower.

We no longer support 2008 and lower so these defines will never be used.
2025-12-11 21:01:29 +00:00 · 2013-05-05 16:58:16 -07:00 · 2013-05-05 16:58:16 -07:00 · 23c524812d
commit 23c524812d
parent c6ca89907c
20 changed files with 37 additions and 103 deletions
--- a/common/MiscFunctions.cpp
+++ b/common/MiscFunctions.cpp
@ -38,9 +38,6 @@ using namespace std;
 	#include <windows.h>

 	#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
-	#define vsnprintf	_vsnprintf
-#endif
 	#define strncasecmp	_strnicmp
 	#define strcasecmp  _stricmp
 #else
--- 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

--- a/common/debug.cpp
+++ b/common/debug.cpp
@ -10,9 +10,6 @@ using namespace std;
 	#include <process.h>

 	#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
-	#define vsnprintf	_vsnprintf
-#endif
 	#define strncasecmp	_strnicmp
 	#define strcasecmp  _stricmp
 #else
--- 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 <stdlib.h>
 		#include <crtdbg.h>
-		#if (_MSC_VER < 1300)
-			#include <new>
-			#include <memory>
-			#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
--- 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
--- 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;
--- a/world/LoginServer.cpp
+++ b/world/LoginServer.cpp
@ -31,9 +31,6 @@ using namespace std;
 	#include <winsock.h>

 	#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
-	#define vsnprintf	_vsnprintf
-#endif
 	#define strncasecmp	_strnicmp
 	#define strcasecmp	_stricmp
 #else // Pyro: fix for linux
--- a/world/client.cpp
+++ b/world/client.cpp
@ -20,9 +20,6 @@ using namespace std;
 	#include <windows.h>
 	#include <winsock.h>
 	#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
-	#define vsnprintf	_vsnprintf
-#endif
 	#define strncasecmp	_strnicmp
 	#define strcasecmp  _stricmp
 #else
--- 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
--- a/world/net.cpp
+++ b/world/net.cpp
@ -47,9 +47,6 @@ using namespace std;
 #ifdef _WINDOWS
 	#include <process.h>
 	#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
-	#define vsnprintf	_vsnprintf
-#endif
 	#define strncasecmp	_strnicmp
 	#define strcasecmp  _stricmp
 	#include <conio.h>
--- a/zone/PlayerCorpse.cpp
+++ b/zone/PlayerCorpse.cpp
@ -28,12 +28,9 @@ Child of the Mob class.
 #include <sstream>
 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"
--- 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"
--- 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 <stdarg.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include "../common/unix.h"
-#define abs64 abs
+	#include <stdarg.h>
+	#include <sys/socket.h>
+	#include <netinet/in.h>
+	#include "../common/unix.h"
+	#define abs64 abs
 #endif

 extern volatile bool RunLoops;
--- 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
--- a/zone/client_process.cpp
+++ b/zone/client_process.cpp
@ -32,9 +32,6 @@
 	#include <windows.h>
 	#include <winsock.h>
 	#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
-	#define vsnprintf	_vsnprintf
-#endif
 	#define strncasecmp	_strnicmp
 	#define strcasecmp  _stricmp
 #else
--- 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;
--- 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 <conio.h>
-#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
-	#define vsnprintf	_vsnprintf
-#endif
-#define strncasecmp	_strnicmp
-#define strcasecmp  _stricmp
+	#include <conio.h>
+	#define snprintf	_snprintf
+	#define strncasecmp	_strnicmp
+	#define strcasecmp  _stricmp
 #endif

 volatile bool RunLoops = true;
--- 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"
--- a/zone/tribute.cpp
+++ b/zone/tribute.cpp
@ -27,16 +27,13 @@
 using namespace std;

 #ifdef _WINDOWS
-#include <windows.h>
-#include <winsock.h>
-#include <process.h>
+	#include <windows.h>
+	#include <winsock.h>
+	#include <process.h>

-#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 <stdarg.h>
 #include <sys/socket.h>
--- a/zone/worldserver.cpp
+++ b/zone/worldserver.cpp
@ -29,9 +29,6 @@ using namespace std;
 	#include <process.h>

 	#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
-	#define vsnprintf	_vsnprintf
-#endif
 	#define strncasecmp	_strnicmp
 	#define strcasecmp	_stricmp
 #endif