From 4366070611f20b5026c8c30cbb83145e365d868d Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Wed, 8 Jul 2015 22:28:20 -0700 Subject: [PATCH 1/2] Update btQuickprof.cpp deal with Windows XP users, see https://github.com/bulletphysics/bullet3/issues/289#issuecomment-119133169 --- src/LinearMath/btQuickprof.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LinearMath/btQuickprof.cpp b/src/LinearMath/btQuickprof.cpp index bdda0291a..5d541be20 100644 --- a/src/LinearMath/btQuickprof.cpp +++ b/src/LinearMath/btQuickprof.cpp @@ -44,7 +44,7 @@ static btClock gProfileClock; #else //_XBOX #include -#if WINVER < 0x0600 +#if WINVER < 0x0602 ULONGLONG GetTickCount64() { return GetTickCount(); } #endif From c293c3df8febd4339090071702dfab9117272889 Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Wed, 8 Jul 2015 23:22:41 -0700 Subject: [PATCH 2/2] Update btQuickprof.cpp --- src/LinearMath/btQuickprof.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LinearMath/btQuickprof.cpp b/src/LinearMath/btQuickprof.cpp index 5d541be20..d88d965a4 100644 --- a/src/LinearMath/btQuickprof.cpp +++ b/src/LinearMath/btQuickprof.cpp @@ -44,8 +44,8 @@ static btClock gProfileClock; #else //_XBOX #include -#if WINVER < 0x0602 -ULONGLONG GetTickCount64() { return GetTickCount(); } +#if WINVER <0x0602 +#define GetTickCount64 GetTickCount #endif #endif //_XBOX