summaryrefslogtreecommitdiff
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-08-08 17:22:44 +0000
committerIan Romanick <idr@us.ibm.com>2005-08-08 17:22:44 +0000
commitda0c5b2e2ca1d00b98d8c729a99c0e83431a5c37 (patch)
tree445edcca7794a6271ee354eef316d413f9f04951 /src/mesa/drivers
parent0d942b740c6bf82bf769f77ab979df11682a338c (diff)
Since glcontextmodes.[ch] are no longer used in the DRI drivers, removed the
IN_DRI_DRIVER cruft. This was suggested by George Fufutos.
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/common/glcontextmodes.c8
-rw-r--r--src/mesa/drivers/dri/common/glcontextmodes.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/common/glcontextmodes.c b/src/mesa/drivers/dri/common/glcontextmodes.c
index beac89717a..4bff387ae0 100644
--- a/src/mesa/drivers/dri/common/glcontextmodes.c
+++ b/src/mesa/drivers/dri/common/glcontextmodes.c
@@ -31,7 +31,7 @@
* \author Ian Romanick <idr@us.ibm.com>
*/
-#if defined(IN_DRI_DRIVER) || defined(IN_MINI_GLX)
+#if defined(IN_MINI_GLX)
# include <stdlib.h>
# include <string.h>
# include <GL/gl.h>
@@ -55,11 +55,11 @@ extern void __glXFree( void * ptr );
# define _mesa_malloc(b) Xmalloc(b)
# define _mesa_free(m) Xfree(m)
# endif /* XFree86Server */
-#endif /* !defined(IN_DRI_DRIVER) */
+#endif /* !defined(IN_MINI_GLX) */
#include "glcontextmodes.h"
-#if !defined(IN_DRI_DRIVER) && !defined(IN_MINI_GLX)
+#if !defined(IN_MINI_GLX)
#define NUM_VISUAL_TYPES 6
/**
@@ -320,7 +320,7 @@ _gl_get_context_mode_data(const __GLcontextModes *mode, int attribute,
return GLX_BAD_ATTRIBUTE;
}
}
-#endif /* !defined(IN_DRI_DRIVER) */
+#endif /* !defined(IN_MINI_GLX) */
/**
diff --git a/src/mesa/drivers/dri/common/glcontextmodes.h b/src/mesa/drivers/dri/common/glcontextmodes.h
index fdf1e76782..4b5c6f68b8 100644
--- a/src/mesa/drivers/dri/common/glcontextmodes.h
+++ b/src/mesa/drivers/dri/common/glcontextmodes.h
@@ -32,14 +32,14 @@
#include "GL/internal/glcore.h"
-#if !defined(IN_DRI_DRIVER) && !defined(IN_MINI_GLX)
+#if !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,
const __GLXvisualConfig * config );
extern int _gl_get_context_mode_data( const __GLcontextModes *mode,
int attribute, int *value_return );
-#endif /* !defined(IN_DRI_DRIVER) */
+#endif /* !defined(IN_MINI_GLX) */
extern __GLcontextModes * _gl_context_modes_create( unsigned count,
size_t minimum_size );