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/indirect_size.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/indirect_size.c')
-rw-r--r-- | src/glx/indirect_size.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glx/indirect_size.c b/src/glx/indirect_size.c index 0c136d26cd..411a0e42c5 100644 --- a/src/glx/indirect_size.c +++ b/src/glx/indirect_size.c @@ -48,7 +48,7 @@ # endif -#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__) +#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL) # undef HAVE_ALIAS #endif #ifdef HAVE_ALIAS |