XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mpx

Browse Source
This commit is contained in:
Peter Hutterer
2008-05-26 17:37:31 +09:30
parent 5fe57787fa 29586101dc
commit 26c1958c32
155 changed files with 34604 additions and 13167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mi/miinitext.c
View File

@@ -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
}