Fix build under VC7

pull/216/head
castano 16 years ago
parent 9ea1934097
commit 66b18f2dbd

@ -6,8 +6,10 @@
#include <nvcore/nvcore.h> #include <nvcore/nvcore.h>
#if NV_CC_MSVC #if NV_CC_MSVC
#if _MSC_VER >= 1400
# include <intrin.h> // __rdtsc # include <intrin.h> // __rdtsc
#endif #endif
#endif
namespace nv namespace nv
@ -27,6 +29,16 @@ namespace nv
}; };
#if NV_CC_MSVC #if NV_CC_MSVC
#if _MSC_VER < 1400
inline uint64 rdtsc()
{
uint64 t;
__asm rdtsc
__asm mov DWORD PTR [t], eax
__asm mov DWORD PTR [t+4], edx
return t;
}
#else
#pragma intrinsic(__rdtsc) #pragma intrinsic(__rdtsc)
inline uint64 rdtsc() inline uint64 rdtsc()
@ -34,6 +46,7 @@ namespace nv
return __rdtsc(); return __rdtsc();
} }
#endif #endif
#endif
#if NV_CC_GNUC #if NV_CC_GNUC

Loading…
Cancel
Save