Merge remote-tracking branch 'bp/master'

This commit is contained in:
=
2015-07-14 09:02:11 -07:00

View File

@@ -44,8 +44,8 @@ static btClock gProfileClock;
#else //_XBOX #else //_XBOX
#include <windows.h> #include <windows.h>
#if WINVER < 0x0600 #if WINVER <0x0602
ULONGLONG GetTickCount64() { return GetTickCount(); } #define GetTickCount64 GetTickCount
#endif #endif
#endif //_XBOX #endif //_XBOX