darwin: Address a build failure on Leopard and earlier OS versions
authorJeremy Huddleston <jeremyhu@apple.com>
Fri, 18 May 2012 18:31:24 +0000 (11:31 -0700)
committerJeremy Huddleston <jeremyhu@apple.com>
Fri, 18 May 2012 18:32:40 +0000 (11:32 -0700)
<https://trac.macports.org/ticket/34499>

Regression-from: 51691f0767f6a75a1f549cd979a878a0ad12a228
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
src/glx/apple/apple_glx_log.c

index 9ebf666c9b4c0f6865ff31a38b005da91f43179b..5b9a865b610f1c29117d0e46def458b4ace4e566 100644 (file)
@@ -76,7 +76,17 @@ void _apple_glx_vlog(int level, const char *file, const char *function,
     uint64_t thread = 0;
 
     if (pthread_is_threaded_np()) {
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+        thread = (uint64_t)(uintptr_t)pthread_self();
+#elif MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+        if (&pthread_threadid_np) {
+            pthread_threadid_np(NULL, &thread);
+        } else {
+            thread = (uint64_t)(uintptr_t)pthread_self();
+        }
+#else
         pthread_threadid_np(NULL, &thread);
+#endif
     }
 
     if (diagnostic) {