From 968e58b55b87cbdd0d7a2a3ce87be6459880c78f Mon Sep 17 00:00:00 2001 From: Garett Bass Date: Sun, 3 Feb 2013 13:50:56 -0800 Subject: [PATCH] Use gettimeofday() on OSX I was getting very strange numbers from mach_absolute_time(), gettimeofday() works fine. --- include/bx/timer.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/include/bx/timer.h b/include/bx/timer.h index 40a62dd..4262ce8 100644 --- a/include/bx/timer.h +++ b/include/bx/timer.h @@ -10,10 +10,8 @@ #if BX_PLATFORM_ANDROID # include // clock, clock_gettime -#elif BX_PLATFORM_NACL || BX_PLATFORM_LINUX +#elif BX_PLATFORM_NACL || BX_PLATFORM_LINUX || BX_PLATFORM_OSX # include // gettimeofday -#elif BX_PLATFORM_OSX -# include // mach_absolute_time/mach_timebase_info #elif BX_PLATFORM_WINDOWS # include #endif // BX_PLATFORM_ @@ -30,8 +28,6 @@ namespace bx int64_t i64 = li.QuadPart; #elif BX_PLATFORM_ANDROID || BX_PLATFORM_EMSCRIPTEN int64_t i64 = clock(); -#elif BX_PLATFORM_OSX - int64_t i64 = mach_absolute_time(); #elif 0 // BX_PLATFORM_LINUX struct timespec now; clock_gettime(CLOCK_MONOTONIC_RAW, &now); @@ -53,10 +49,6 @@ namespace bx return li.QuadPart; #elif BX_PLATFORM_ANDROID || BX_PLATFORM_EMSCRIPTEN return CLOCKS_PER_SEC; -#elif BX_PLATFORM_OSX - mach_timebase_info_data_t info; - mach_timebase_info(&info); - return (int64_t)(info.denom * 1000000) / info.numer; #else return 1000000; #endif // BX_PLATFORM_