From df7966053102ed6e509992554ab7544c56454f26 Mon Sep 17 00:00:00 2001 From: smatz Date: Fri, 30 Jan 2009 17:54:48 +0000 Subject: (svn r15296) -Cleanup: remove redundant _MSC_VER >= 1400 checks, older versions aren't supported anymore. One check in stdafx.h is enough --- src/os_timer.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'src/os_timer.cpp') 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 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 */ -- cgit v1.2.3-54-g00ecf