mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Move mach_timebase_info init to core_init()

Browse Source
This commit is contained in:
Richard Jenkins
2017-05-05 00:40:07 +01:00
parent f8b79a4a3f
commit 28eb5fb279
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/openrct2/platform/shared.c
View File

@@ -41,12 +41,7 @@
#ifdef __APPLE__
#include <mach/mach_time.h>
#endif
#if (defined __APPLE__ \
&& __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200 \
&& __clang_major__ >= 8)
#define MACOS_SIERRA_ONWARDS 1
#include <AvailabilityMacros.h>
#endif
typedef void(*update_palette_func)(const uint8*, sint32, sint32);
@@ -82,8 +77,7 @@ static float _gestureRadius;
static void platform_create_window();
#if defined(__APPLE__) && !defined(MACOS_SIERRA_ONWARDS)
mach_timebase_info_data_t mach_base_info = { 0 };
bool mach_info_initialised = false;
mach_timebase_info_data_t _mach_base_info = { 0 };
#endif
static sint32 resolution_sort_func(const void *pa, const void *pb)
@@ -780,16 +774,8 @@ uint32 platform_get_ticks()
{
#ifdef _WIN32
return GetTickCount();
#elif defined(__APPLE__) && !defined(MACOS_SIERRA_ONWARDS)
if (!mach_info_initialised) {
kern_return_t ret = mach_timebase_info(&mach_base_info);
if (ret != 0) {
log_fatal("Unable to get mach_timebase_info.");
exit(-1);
}
mach_info_initialised = true;
}
return (uint32)(((mach_absolute_time() * mach_base_info.numer) / mach_base_info.denom) / 1000000);
#elif defined(__APPLE__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200)
return (uint32)(((mach_absolute_time() * _mach_base_info.numer) / _mach_base_info.denom) / 1000000);
#else
struct timespec ts;
if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0) {
@@ -822,4 +808,12 @@ uint8 platform_get_currency_value(const char *currCode) {
void core_init()
{
bitcount_init();
#if defined(__APPLE__) && !defined(MACOS_SIERRA_ONWARDS)
kern_return_t ret = mach_timebase_info(&_mach_base_info);
if (ret != 0) {
log_fatal("Unable to get mach_timebase_info.");
exit(-1);
}
#endif
}