diff options
Diffstat (limited to '3rdparty/bx/src/timer.cpp')
-rw-r--r-- | 3rdparty/bx/src/timer.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/3rdparty/bx/src/timer.cpp b/3rdparty/bx/src/timer.cpp index 8cfebdda7f5..faecf822e10 100644 --- a/3rdparty/bx/src/timer.cpp +++ b/3rdparty/bx/src/timer.cpp @@ -1,9 +1,8 @@ /* - * Copyright 2010-2018 Branimir Karadzic. All rights reserved. - * License: https://github.com/bkaradzic/bx#license-bsd-2-clause + * Copyright 2010-2022 Branimir Karadzic. All rights reserved. + * License: https://github.com/bkaradzic/bx/blob/master/LICENSE */ -#include "bx_p.h" #include <bx/timer.h> #if BX_CRT_NONE @@ -13,6 +12,9 @@ #elif BX_PLATFORM_EMSCRIPTEN # include <emscripten.h> #elif BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOXONE || BX_PLATFORM_WINRT +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif // WIN32_LEAN_AND_MEAN # include <windows.h> #else # include <sys/time.h> // gettimeofday @@ -41,7 +43,7 @@ namespace bx gettimeofday(&now, 0); int64_t i64 = now.tv_sec*INT64_C(1000000) + now.tv_usec; #else - BX_CHECK(false, "Not implemented!"); + BX_ASSERT(false, "Not implemented!"); int64_t i64 = UINT64_MAX; #endif // BX_PLATFORM_ return i64; |