We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] better check for clock_gettime_nsec_np()

5467-5.patch (text/plain), 3.55 KB, created by Ozkan Sezer on 2021-01-24 14:40:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ozkan Sezer

Created: 2021-01-24 14:40:55 UTC

Size: 3.55 KB

patch

obsolete

>diff --git a/include/SDL_config_macosx.h b/include/SDL_config_macosx.h
>--- a/include/SDL_config_macosx.h
>+++ b/include/SDL_config_macosx.h
>@@ -56,6 +56,9 @@
> #define HAVE_CALLOC 1
> #define HAVE_REALLOC    1
> #define HAVE_FREE   1
>+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
>+#define HAVE_CLOCK_GETTIME_NSEC_NP 1
>+#endif
> #define HAVE_ALLOCA 1
> #define HAVE_GETENV 1
> #define HAVE_SETENV 1
>diff --git a/CMakeLists.txt b/CMakeLists.txt
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -873,7 +873,14 @@
>     else()
>       set(HAVE_ALLOCA_H 1)
>       set(HAVE_ALLOCA 1)
>-      check_symbol_exists(clock_gettime_nsec_np "time.h" HAVE_CLOCK_GETTIME_NSEC_NP)
>+      CHECK_C_SOURCE_COMPILES("
>+        #include <AvailabilityMacros.h>
>+        #include <time.h>
>+        #if MAC_OS_X_VERSION_MIN_REQUIRED < 101200
>+        #error Need 10.12 or newer target
>+        #endif
>+        int main(int argc, char **argv) { return !clock_gettime_nsec_np(CLOCK_MONOTONIC); }
>+      " HAVE_CLOCK_GETTIME_NSEC_NP)
>     endif()
> 
>     check_struct_has_member("struct sigaction" "sa_sigaction" "signal.h" HAVE_SA_SIGACTION)
>diff --git a/configure.ac b/configure.ac
>--- a/configure.ac
>+++ b/configure.ac
>@@ -345,7 +345,7 @@
>         AC_DEFINE(HAVE_MPROTECT, 1, [ ])
>         ]),
>     )
>-    AC_CHECK_FUNCS(malloc calloc realloc free getenv setenv putenv unsetenv qsort abs bcopy memset memcpy memmove wcslen wcslcpy wcslcat wcsdup wcsstr wcscmp wcsncmp wcscasecmp _wcsicmp wcsncasecmp _wcsnicmp strlen strlcpy strlcat _strrev _strupr _strlwr strchr strrchr strstr strtok_r itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp vsscanf vsnprintf fopen64 fseeko fseeko64 sigaction setjmp nanosleep sysconf sysctlbyname getauxval elf_aux_info clock_gettime_nsec_np poll _Exit)
>+    AC_CHECK_FUNCS(malloc calloc realloc free getenv setenv putenv unsetenv qsort abs bcopy memset memcpy memmove wcslen wcslcpy wcslcat wcsdup wcsstr wcscmp wcsncmp wcscasecmp _wcsicmp wcsncasecmp _wcsnicmp strlen strlcpy strlcat _strrev _strupr _strlwr strchr strrchr strstr strtok_r itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp vsscanf vsnprintf fopen64 fseeko fseeko64 sigaction setjmp nanosleep sysconf sysctlbyname getauxval elf_aux_info poll _Exit)
> 
>     AC_CHECK_LIB(m, pow, [LIBS="$LIBS -lm"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm"])
>     AC_CHECK_FUNCS(acos acosf asin asinf atan atanf atan2 atan2f ceil ceilf copysign copysignf cos cosf exp expf fabs fabsf floor floorf trunc truncf fmod fmodf log logf log10 log10f lround lroundf pow powf round roundf scalbn scalbnf sin sinf sqrt sqrtf tan tanf)
>@@ -3486,6 +3486,29 @@
>     fi
> }
> 
>+dnl Check for clock_gettime_nsec_np()
>+CheckClockGettimeAPPLE()
>+{
>+    have_clock_gettime_apple=no
>+    AC_MSG_CHECKING(for clock_gettime_nsec_np)
>+    AC_TRY_LINK([
>+#include <AvailabilityMacros.h>
>+#include <time.h>
>+      ],[
>+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101200
>+#error Need 10.12 or newer target
>+#endif
>+        return !clock_gettime_nsec_np(CLOCK_MONOTONIC);
>+      ],[
>+        have_clock_gettime_apple=yes
>+    ])
>+    AC_MSG_RESULT($have_clock_gettime_apple)
>+
>+    if test x$have_clock_gettime_apple = xyes; then
>+        AC_DEFINE(HAVE_CLOCK_GETTIME_NSEC_NP, 1, [ ])
>+    fi
>+}
>+
> dnl Check for a valid linux/version.h
> CheckLinuxVersion()
> {
>@@ -4116,6 +4139,7 @@
> 
>         CheckVisibilityHidden
>         CheckDeclarationAfterStatement
>+        CheckClockGettimeAPPLE
>         CheckDummyVideo
>         CheckDiskAudio
>         CheckDummyAudio

Actions: View | Diff

Attachments on bug 5467: 4666 | 4668 | 4671 | 4672 | 4697 | 4700 | 4701

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.