Merge remote-tracking branch 'bp/master'

2015-07-14 09:02:11 -07:00
parent 482f31597b 70837d2d0b
commit 2e0da2b7a1
1 changed files with 2 additions and 2 deletions
--- a/src/LinearMath/btQuickprof.cpp
+++ b/src/LinearMath/btQuickprof.cpp
@@ -44,8 +44,8 @@ static btClock gProfileClock;
 #else //_XBOX
 	#include <windows.h>

-#if WINVER < 0x0600
-ULONGLONG GetTickCount64() { return GetTickCount(); }
+#if WINVER <0x0602
+#define GetTickCount64 GetTickCount
 #endif

 #endif //_XBOX