diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-28 07:21:25 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-28 07:21:25 -0600 |
| commit | 1fa7789e828d1005e2473fc7cd364bd45eb30843 (patch) | |
| tree | 5e3e1978e6cc511e90298622b7a04840a285782d /src/glx/drisw_glx.c | |
| parent | 37e98e5cd217075d58456753ed8450dc116fe32c (diff) | |
| parent | eecd2a59c1205246cc220ab09a79988838bb1759 (diff) | |
Merge branch '7.8'
Conflicts:
src/glx/dri2_glx.c
src/glx/glx_pbuffer.c
Diffstat (limited to 'src/glx/drisw_glx.c')
| -rw-r--r-- | src/glx/drisw_glx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index 786faff81c..cdb1d9f4dc 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -21,7 +21,7 @@ * SOFTWARE. */ -#ifdef GLX_DIRECT_RENDERING +#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) #include <X11/Xlib.h> #include "glxclient.h" |