diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2017-11-05 21:25:49 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-27 02:42:18 +0100 |
| commit | 6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060 (patch) | |
| tree | 4786ef47d0905699657939e469414ab1438ff2e8 /nx-X11/programs/Xserver/mi/miinitext.c | |
| parent | 23dd2959ba5e87d078436b2389d084b76581d12f (diff) | |
| download | nx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.tar.gz nx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.tar.bz2 nx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.zip | |
Lift mi to xorg-xserver-7.1/1.1.0 state
I left out glx changes to miinitext.c for now.
Diffstat (limited to 'nx-X11/programs/Xserver/mi/miinitext.c')
| -rw-r--r-- | nx-X11/programs/Xserver/mi/miinitext.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index f40ea8a8e..5f9d96302 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -80,9 +80,6 @@ extern Bool noDamageExtension; #ifdef DBE extern Bool noDbeExtension; #endif -#ifdef DPSEXT -extern Bool noDPSExtension; -#endif #ifdef DPMSExtension extern Bool noDPMSExtension; #endif @@ -142,7 +139,6 @@ extern Bool noXIdleExtension; extern Bool noXvExtension; #endif -#define INITARGS void typedef void (*InitExtension)(void); #ifdef MITSHM @@ -228,6 +224,11 @@ extern void SecurityExtensionInit(void); extern void XFree86BigfontExtensionInit(void); #endif #ifdef GLXEXT +/* +typedef struct __GLXprovider __GLXprovider; +extern __GLXprovider __glXMesaProvider; +extern void GlxPushProvider(__GLXprovider *impl); +*/ #ifndef __DARWIN__ extern void GlxExtensionInit(void); extern void GlxWrapInitVisuals(miInitVisualsProcPtr *); @@ -290,9 +291,6 @@ static ExtensionToggle ExtensionToggleList[] = #ifdef DBE { "DOUBLE-BUFFER", &noDbeExtension }, #endif -#ifdef DPSEXT - { "DPSExtension", &noDPSExtension }, -#endif #ifdef DPMSExtension { "DPMS", &noDPMSExtension }, #endif @@ -447,6 +445,9 @@ InitExtensions(argc, argv) #endif #endif #ifdef GLXEXT + /* + GlxPushProvider(&__glXMesaProvider); + */ #ifndef __DARWIN__ if (!noGlxExtension) GlxExtensionInit(); #else |