Module: Mesa Branch: master Commit: 27b821bc95ea01cc4292ada9c7c65211580d1f98 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=27b821bc95ea01cc4292ada9c7c65211580d1f98
Author: Jeremy Huddleston <jerem...@apple.com> Date: Fri May 18 11:31:24 2012 -0700 darwin: Address a build failure on Leopard and earlier OS versions <https://trac.macports.org/ticket/34499> Regression-from: 51691f0767f6a75a1f549cd979a878a0ad12a228 Signed-off-by: Jeremy Huddleston <jerem...@apple.com> --- src/glx/apple/apple_glx_log.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/glx/apple/apple_glx_log.c b/src/glx/apple/apple_glx_log.c index 9ebf666..5b9a865 100644 --- a/src/glx/apple/apple_glx_log.c +++ b/src/glx/apple/apple_glx_log.c @@ -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) { _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
