diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-04-30 15:27:13 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-04-30 15:27:13 +0200 |
| commit | 7662e3519bef3802024da3050b886068281e02b1 (patch) | |
| tree | bc5bf675e67febffaf9e4d1fadd139e8c253ae32 /src/glx/dri_glx.c | |
| parent | 9a966b93c03aecac8eb72e6133aa9a2f2c7673f3 (diff) | |
| parent | 7c769bef052fc1936d7ab33e291bb4646dc5b0d1 (diff) | |
Merge commit 'origin/master' into gallium-msaa
Diffstat (limited to 'src/glx/dri_glx.c')
| -rw-r--r-- | src/glx/dri_glx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glx/dri_glx.c b/src/glx/dri_glx.c index e47db82b70..74afa60301 100644 --- a/src/glx/dri_glx.c +++ b/src/glx/dri_glx.c @@ -32,7 +32,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -#ifdef GLX_DIRECT_RENDERING +#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) #include <X11/Xlib.h> #include <X11/extensions/Xfixes.h> |