From 26143750f336e2ada89eb03e3f24e50d7c3e5765 Mon Sep 17 00:00:00 2001
From: Arthur Ice <addtheice@gmail.com>
Date: Mon, 20 May 2013 22:40:10 -0700
Subject: [PATCH] removed visual studio 5,6,7 specific code except in tinyxml
 and StackWalker.

---
 common/debug.h        | 13 -------------
 zone/PlayerCorpse.cpp |  8 +++-----
 zone/beacon.cpp       | 11 +++++------
 zone/client.cpp       | 20 +++++++++-----------
 zone/net.cpp          |  4 +---
 zone/tribute.cpp      | 23 ++++++++++-------------
 6 files changed, 28 insertions(+), 51 deletions(-)

diff --git a/common/debug.h b/common/debug.h
index 3961598a6..de04fe0ff 100644
--- a/common/debug.h
+++ b/common/debug.h
@@ -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
 
diff --git a/zone/PlayerCorpse.cpp b/zone/PlayerCorpse.cpp
index 1011e9804..eeb6fd5c9 100644
--- a/zone/PlayerCorpse.cpp
+++ b/zone/PlayerCorpse.cpp
@@ -28,12 +28,10 @@ Child of the Mob class.
 #include <sstream>
 using namespace std;
 #ifdef _WINDOWS
-#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
+    #define snprintf	_snprintf
 	#define vsnprintf	_vsnprintf
-#endif
-#define strncasecmp	_strnicmp
-#define strcasecmp	_stricmp
+    #define strncasecmp	_strnicmp
+    #define strcasecmp	_stricmp
 #endif
 
 #include "masterentity.h"
diff --git a/zone/beacon.cpp b/zone/beacon.cpp
index 2d2d9a942..9b88dd524 100644
--- a/zone/beacon.cpp
+++ b/zone/beacon.cpp
@@ -24,13 +24,12 @@ 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 vsnprintf	_vsnprintf
+    #define strncasecmp	_strnicmp
+    #define strcasecmp	_stricmp
 #endif
 
 #include "masterentity.h"
diff --git a/zone/client.cpp b/zone/client.cpp
index 5b021b715..3730c1b4d 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -28,19 +28,17 @@ using namespace std;
 
 // for windows compile
 #ifdef _WINDOWS
-#define abs64 _abs64
-#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
+    #define abs64 _abs64
+    #define snprintf	_snprintf
 	#define vsnprintf	_vsnprintf
-#endif
-#define strncasecmp	_strnicmp
-#define strcasecmp  _stricmp
+    #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;
diff --git a/zone/net.cpp b/zone/net.cpp
index 896adb49f..b408c8a7f 100644
--- a/zone/net.cpp
+++ b/zone/net.cpp
@@ -76,10 +76,8 @@
 #ifdef _WINDOWS
     #include <conio.h>
     #include <process.h>
-    #if (_MSC_VER < 1500)
-        #define vsnprintf	_vsnprintf
-    #endif
     
+    #define vsnprintf	_vsnprintf
     #define snprintf	_snprintf
     #define strncasecmp	_strnicmp
     #define strcasecmp	_stricmp
diff --git a/zone/tribute.cpp b/zone/tribute.cpp
index 9d864a72d..1e6bd0a31 100644
--- a/zone/tribute.cpp
+++ b/zone/tribute.cpp
@@ -27,21 +27,18 @@
 using namespace std;
 
 #ifdef _WINDOWS
-#include <windows.h>
-#include <winsock.h>
-#include <process.h>
-
-#define snprintf	_snprintf
-#if (_MSC_VER < 1500)
+    #include <windows.h>
+    #include <winsock.h>
+    #include <process.h>
+    #define snprintf	_snprintf
 	#define vsnprintf	_vsnprintf
-#endif
-#define strncasecmp	_strnicmp
-#define strcasecmp	_stricmp
+    #define strncasecmp	_strnicmp
+    #define strcasecmp	_stricmp
 #else
-#include <stdarg.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include "../common/unix.h"
+    #include <stdarg.h>
+    #include <sys/socket.h>
+    #include <netinet/in.h>
+    #include "../common/unix.h"
 #endif
 
 /*