OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d59b2c4
)
darwin: Address a build failure on Leopard and earlier OS versions
author
Jeremy Huddleston
<jeremyhu@apple.com>
Fri, 18 May 2012 18:31:24 +0000
(11:31 -0700)
committer
Jeremy 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
patch
|
blob
|
history
diff --git
a/src/glx/apple/apple_glx_log.c
b/src/glx/apple/apple_glx_log.c
index
9ebf666
..
5b9a865
100644
(file)
--- 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) {