Mesa (7.10): apple: ifdef out come glapi-foo on darwin

[Jeremy Huddleston]

Module: Mesa
Branch: 7.10
Commit: 891ce8aaa875cd196e5754ba302bbfcc90d0fcf2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=891ce8aaa875cd196e5754ba302bbfcc90d0fcf2

Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sun Jun  5 19:57:52 2011 -0400

apple: ifdef out come glapi-foo on darwin

Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
(cherry picked from commit 8593bb32eae5368c1ba52504133b0bf200bf8e74)

---

 src/glx/glxcurrent.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/glx/glxcurrent.c b/src/glx/glxcurrent.c
index 3631738..ce9d778 100644
--- a/src/glx/glxcurrent.c
+++ b/src/glx/glxcurrent.c
@@ -234,6 +234,7 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
       return False;
    }
 
+#ifndef GLX_USE_APPLEGL
    _glapi_check_multithread();
 
    if (gc != NULL && gc->thread_id != 0 && gc->thread_id != _glthread_GetID()) {
@@ -241,6 +242,7 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
                          BadAccess, X_GLXMakeContextCurrent);
       return False;
    }
+#endif
 
    if (oldGC == gc &&
        gc->currentDrawable == draw && gc->currentReadable == read)
@@ -258,7 +260,9 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
       gc->currentDpy = dpy;
       gc->currentDrawable = draw;
       gc->currentReadable = read;
+#ifndef GLX_USE_APPLEGL
       gc->thread_id = _glthread_GetID();
+#endif
       __glXSetCurrentContext(gc);
       ret = gc->vtable->bind(gc, oldGC, draw, read);
    } else {