From 7fc9bf62ce51a58a9112677581c6fbe9daea07e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 5 May 2017 08:46:03 +0200 Subject: [PATCH] Fix macros detecting macOS version --- src/openrct2/platform/shared.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/openrct2/platform/shared.c b/src/openrct2/platform/shared.c index b25b2b838e..cc9f92e33d 100644 --- a/src/openrct2/platform/shared.c +++ b/src/openrct2/platform/shared.c @@ -42,6 +42,9 @@ #ifdef __APPLE__ #include #include + #ifndef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ + #error Missing __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ define + #endif #endif typedef void(*update_palette_func)(const uint8*, sint32, sint32); @@ -76,7 +79,7 @@ static float _gestureRadius; static void platform_create_window(); -#if defined(__APPLE__) && !defined(MACOS_SIERRA_ONWARDS) +#if defined(__APPLE__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200) mach_timebase_info_data_t _mach_base_info = { 0 }; #endif @@ -809,7 +812,7 @@ void core_init() { bitcount_init(); -#if defined(__APPLE__) && !defined(MACOS_SIERRA_ONWARDS) +#if defined(__APPLE__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200) kern_return_t ret = mach_timebase_info(&_mach_base_info); if (ret != 0) { log_fatal("Unable to get mach_timebase_info.");