diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:37:59 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:37:59 +0000 |
| commit | e56e24af252bd3b8e58076adf0f8eabf1103f187 (patch) | |
| tree | 9d378148aa5cfb83675cfb070a6af296cb4b3e4f /GL/glx/glxscreens.c | |
| parent | 2e1868b560315a8b20d688e646c489a5ad93eeae (diff) | |
Merge DRI-trunk-20040613 changes in programs/Xserver/GL.
Diffstat (limited to 'GL/glx/glxscreens.c')
| -rw-r--r-- | GL/glx/glxscreens.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c index 04882098a..0b985f06c 100644 --- a/GL/glx/glxscreens.c +++ b/GL/glx/glxscreens.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.11 2003/06/23 17:35:44 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.14 2004/02/09 23:46:31 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -135,7 +135,9 @@ static char GLXServerExtensions[] = "GLX_EXT_import_context " "GLX_OML_swap_method " "GLX_SGI_make_current_read " +#ifndef __DARWIN__ "GLX_SGIS_multisample " +#endif "GLX_SGIX_fbconfig " ; |