diff options
| -rw-r--r-- | src/map.cpp | 2 | ||||
| -rw-r--r-- | src/misc/binaryheap.hpp | 6 | ||||
| -rw-r--r-- | src/misc/strapi.hpp | 12 | ||||
| -rw-r--r-- | src/os_timer.cpp | 12 | ||||
| -rw-r--r-- | src/stdafx.h | 4 |
5 files changed, 10 insertions, 26 deletions
diff --git a/src/map.cpp b/src/map.cpp index 72a4f550f..76ff175e4 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -10,7 +10,7 @@ #include "core/math_func.hpp" #include "map_func.h" -#if defined(_MSC_VER) && _MSC_VER >= 1400 /* VStudio 2005 is stupid! */ +#if defined(_MSC_VER) /* Why the hell is that not in all MSVC headers?? */ extern "C" _CRTIMP void __cdecl _assert(void *, void *, unsigned); #endif diff --git a/src/misc/binaryheap.hpp b/src/misc/binaryheap.hpp index ed5a44b71..2206ccd03 100644 --- a/src/misc/binaryheap.hpp +++ b/src/misc/binaryheap.hpp @@ -5,12 +5,6 @@ #ifndef BINARYHEAP_HPP #define BINARYHEAP_HPP -//void *operator new (size_t size, void *p) {return p;} -#if defined(_MSC_VER) && (_MSC_VER >= 1400) -//void operator delete (void *p, void *p2) {} -#endif - - /** * Binary Heap as C++ template. * diff --git a/src/misc/strapi.hpp b/src/misc/strapi.hpp index 53e0dd9e5..eec7c6437 100644 --- a/src/misc/strapi.hpp +++ b/src/misc/strapi.hpp @@ -38,11 +38,11 @@ template <> /*static*/ inline size_t CStrApiBaseT<char>::StrLen(const char *s) /** ::vsprintf wrapper specialization for char */ template <> /*static*/ inline int CStrApiBaseT<char>::SPrintFL(char *buf, size_t count, const char *fmt, va_list args) { -#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(WINCE) // VC 8.0 and above +#if defined(_MSC_VER) && !defined(WINCE) return ::vsnprintf_s(buf, count, count - 1, fmt, args); -#else /* ! VC 8.0 and above */ +#else return ::vsnprintf(buf, count, fmt, args); -#endif +#endif /* _MSC_VER && ! WINCE */ } #if defined(HAS_WCHAR) @@ -55,15 +55,15 @@ template <> /*static*/ inline size_t CStrApiBaseT<wchar_t>::StrLen(const wchar_t /** ::vsprintf wrapper specialization for wchar_t */ template <> /*static*/ inline int CStrApiBaseT<wchar_t>::SPrintFL(wchar_t *buf, size_t count, const wchar_t *fmt, va_list args) { -#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(WINCE) // VC 8.0 and above +#if defined(_MSC_VER) && !defined(WINCE) return ::_vsnwprintf_s(buf, count, count - 1, fmt, args); -#else /* ! VC 8.0 and above */ +#else # if defined(_WIN32) return ::_vsnwprintf(buf, count, fmt, args); # else /* !_WIN32 */ return ::vswprintf(buf, count, fmt, args); # endif /* !_WIN32 */ -#endif +#endif /* _MSC_VER && ! WINCE */ } #endif /* HAS_WCHAR */ diff --git a/src/os_timer.cpp b/src/os_timer.cpp index bf0a171de..46bb1d851 100644 --- a/src/os_timer.cpp +++ b/src/os_timer.cpp @@ -9,22 +9,12 @@ /* rdtsc for MSC_VER, uses simple inline assembly, or _rdtsc * from external win64.asm because VS2005 does not support inline assembly */ #if defined(_MSC_VER) && !defined(RDTSC_AVAILABLE) && !defined(WINCE) -# if _MSC_VER >= 1400 #include <intrin.h> uint64 ottd_rdtsc() { return __rdtsc(); } -# else -uint64 _declspec(naked) ottd_rdtsc() -{ - _asm { - rdtsc - ret - } -} -# endif -# define RDTSC_AVAILABLE +#define RDTSC_AVAILABLE #endif /* rdtsc for OS/2. Hopefully this works, who knows */ diff --git a/src/stdafx.h b/src/stdafx.h index 97785e0be..b134cb940 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -167,7 +167,7 @@ #pragma warning(disable: 4200) // nonstandard extension used : zero-sized array in struct/union #if (_MSC_VER < 1400) // MSVC 2005 safety checks - #error "Only MSVC 2005 or higher are supported. MSVC 2003 and earlier are not!. Upgrade your compiler." + #error "Only MSVC 2005 or higher are supported. MSVC 2003 and earlier are not! Upgrade your compiler." #endif /* (_MSC_VER < 1400) */ #pragma warning(disable: 4996) // 'strdup' was declared deprecated #define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions @@ -188,7 +188,7 @@ #endif int CDECL snprintf(char *str, size_t size, const char *format, ...); - #if (_MSC_VER < 1400) || defined(WINCE) + #if defined(WINCE) int CDECL vsnprintf(char *str, size_t size, const char *format, va_list ap); #endif |