diff options
| author | Jon Smirl <[email protected]> | 2005-07-29 00:48:12 +0000 |
|---|---|---|
| committer | Jon Smirl <[email protected]> | 2005-07-29 00:48:12 +0000 |
| commit | 4ce390b9333decc8ffa30ccfc73f8cf264aeea95 (patch) | |
| tree | 82c7d9cf3f904c419b0ce09485cde2b0e6990704 /src/mesa | |
| parent | df68d11b47ffda570b77de6a11bf1afc311f86b2 (diff) | |
Commit Ian's fixes from Bug 3877
I have tested these on miniglx and they seem to be working.
I'm sure Dave will give them a better test.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/common/glcontextmodes.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/glcontextmodes.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/common/glcontextmodes.c b/src/mesa/drivers/dri/common/glcontextmodes.c index 73209a9b01d..beac89717a3 100644 --- a/src/mesa/drivers/dri/common/glcontextmodes.c +++ b/src/mesa/drivers/dri/common/glcontextmodes.c @@ -31,11 +31,11 @@ * \author Ian Romanick <[email protected]> */ -#ifdef IN_DRI_DRIVER +#if defined(IN_DRI_DRIVER) || defined(IN_MINI_GLX) # include <stdlib.h> # include <string.h> # include <GL/gl.h> -# include "dri_interface.h" +# include "GL/internal/dri_interface.h" # include "imports.h" # define __glXMemset memset #else @@ -59,7 +59,7 @@ extern void __glXFree( void * ptr ); #include "glcontextmodes.h" -#if !defined(IN_DRI_DRIVER) +#if !defined(IN_DRI_DRIVER) && !defined(IN_MINI_GLX) #define NUM_VISUAL_TYPES 6 /** diff --git a/src/mesa/drivers/dri/common/glcontextmodes.h b/src/mesa/drivers/dri/common/glcontextmodes.h index ce74287b3d8..fdf1e767824 100644 --- a/src/mesa/drivers/dri/common/glcontextmodes.h +++ b/src/mesa/drivers/dri/common/glcontextmodes.h @@ -32,7 +32,7 @@ #include "GL/internal/glcore.h" -#if !defined(IN_DRI_DRIVER) +#if !defined(IN_DRI_DRIVER) && !defined(IN_MINI_GLX) extern GLint _gl_convert_from_x_visual_type( int visualType ); extern GLint _gl_convert_to_x_visual_type( int visualType ); extern void _gl_copy_visual_to_context_mode( __GLcontextModes * mode, |