1 files changed, 6 insertions, 43 deletions
diff --git a/include/irrTypes.h b/include/irrTypes.h
index e3561cf..f73e0a9 100644
--- a/include/irrTypes.h
+++ b/include/irrTypes.h
@@ -61,22 +61,17 @@ typedef double				f64;
 
 
 #include <wchar.h>
-#ifdef _IRR_WINDOWS_API_
 //! Defines for s{w,n}printf_irr because s{w,n}printf methods do not match the ISO C
 //! standard on Windows platforms.
 //! We want int snprintf_irr(char *str, size_t size, const char *format, ...);
 //! and int swprintf_irr(wchar_t *wcs, size_t maxlen, const wchar_t *format, ...);
-#if defined(_MSC_VER) && _MSC_VER > 1310 && !defined (_WIN32_WCE)
+#if defined(_MSC_VER)
 #define swprintf_irr swprintf_s
 #define snprintf_irr sprintf_s
-#elif !defined(__CYGWIN__)
-#define swprintf_irr _snwprintf
-#define snprintf_irr _snprintf
-#endif
 #else
 #define swprintf_irr swprintf
 #define snprintf_irr snprintf
-#endif // _IRR_WINDOWS_API_
+#endif // _MSC_VER
 
 namespace irr
 {
@@ -89,15 +84,11 @@ namespace irr
 
 //! define a break macro for debugging.
 #if defined(_DEBUG)
-#if defined(_IRR_WINDOWS_API_) && defined(_MSC_VER) && !defined (_WIN32_WCE)
-#if defined(WIN64) || defined(_WIN64) // using portable common solution for x64 configuration
+#if defined(_IRR_WINDOWS_API_) && defined(_MSC_VER)
 	#include <crtdbg.h>
 	#define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) if (_CONDITION_) {_CrtDbgBreak();}
 #else
-	#define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) if (_CONDITION_) {_asm int 3}
-#endif
-#else
-	#include "assert.h"
+	#include <assert.h>
 	#define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) assert( !(_CONDITION_) );
 #endif
 #else
@@ -113,9 +104,9 @@ For functions:		template<class T> _IRR_DEPRECATED_ void test4(void) {}
 **/
 #if defined(IGNORE_DEPRECATED_WARNING)
 #define _IRR_DEPRECATED_
-#elif _MSC_VER >= 1310 //vs 2003 or higher
+#elif defined(_MSC_VER)
 #define _IRR_DEPRECATED_ __declspec(deprecated)
-#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) // all versions above 3.0 should support this feature
+#elif defined(__GNUC__)
 #define _IRR_DEPRECATED_  __attribute__ ((deprecated))
 #else
 #define _IRR_DEPRECATED_
@@ -125,35 +116,7 @@ For functions:		template<class T> _IRR_DEPRECATED_ void test4(void) {}
 /** Usage in a derived class:
 virtual void somefunc() _IRR_OVERRIDE_;
 */
-#if ( ((__GNUC__ > 4 ) || ((__GNUC__ == 4 ) && (__GNUC_MINOR__ >= 7))) && (defined(__GXX_EXPERIMENTAL_CXX0X) || __cplusplus >= 201103L) )
-#define _IRR_OVERRIDE_ override
-#elif (_MSC_VER >= 1600 ) /* supported since MSVC 2010 */
 #define _IRR_OVERRIDE_ override
-#elif (__clang_major__ >= 3 && __has_feature(cxx_override_control))
-#define _IRR_OVERRIDE_ override
-#else
-#define _IRR_OVERRIDE_
-#endif
-
-// memory debugging
-#if defined(_DEBUG) && defined(IRRLICHT_EXPORTS) && defined(_MSC_VER) && \
-	(_MSC_VER > 1299) && !defined(_IRR_DONT_DO_MEMORY_DEBUGGING_HERE) && !defined(_WIN32_WCE)
-
-	#define CRTDBG_MAP_ALLOC
-	#define _CRTDBG_MAP_ALLOC
-	#define DEBUG_CLIENTBLOCK new( _CLIENT_BLOCK, __FILE__, __LINE__)
-	#include <stdlib.h>
-	#include <crtdbg.h>
-	#define new DEBUG_CLIENTBLOCK
-#endif
-
-//! ignore VC8 warning deprecated
-/** The Microsoft compiler */
-#if defined(_IRR_WINDOWS_API_) && defined(_MSC_VER) && (_MSC_VER >= 1400)
-	//#pragma warning( disable: 4996)
-	//#define _CRT_SECURE_NO_DEPRECATE 1
-	//#define _CRT_NONSTDC_NO_DEPRECATE 1
-#endif
 
 
 //! creates four CC codes used in Irrlicht for simple ids