diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-26 17:37:31 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-26 17:37:31 +0930 |
| commit | 26c1958c322be3ac4dfec9ba2c41c5202bd03709 (patch) | |
| tree | 0889c707db86e00f557618f3917b93e1a0472014 /mi | |
| parent | 5fe57787faa2ea4f2f57b25455d200bf924206d6 (diff) | |
| parent | 29586101dc11d498b212510f8dedbfeca7f8c859 (diff) | |
Merge branch 'master' into mpx
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/miinitext.c | 5 |
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 } |