summaryrefslogtreecommitdiff
path: root/mi/miinitext.c
diff options
context:
space:
mode:
Diffstat (limited to 'mi/miinitext.c')
-rw-r--r--mi/miinitext.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c
index a4374d51e..56aa30b92 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -59,6 +59,7 @@ SOFTWARE.
#ifdef HAVE_XNEST_CONFIG_H
#include <xnest-config.h>
+#undef COMPOSITE
#undef DPMSExtension
#endif
@@ -284,7 +285,7 @@ extern void XFree86DGAExtensionInit(INITARGS);
#endif
#ifdef GLXEXT
typedef struct __GLXprovider __GLXprovider;
-extern __GLXprovider __glXMesaProvider;
+extern __GLXprovider __glXDRISWRastProvider;
extern void GlxPushProvider(__GLXprovider *impl);
extern void GlxExtensionInit(INITARGS);
#endif
@@ -571,7 +572,7 @@ InitExtensions(argc, argv)
#endif
#ifdef GLXEXT
- GlxPushProvider(&__glXMesaProvider);
+ GlxPushProvider(&__glXDRISWRastProvider);
if (!noGlxExtension) GlxExtensionInit();
#endif
}