diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-13 12:16:00 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-13 12:16:00 +0200 |
| commit | dcf9ae77854778629cabd0d6943dda3678eb91fa (patch) | |
| tree | 087d3bb4beb55bcc0c5857b41d2b5b10edd0e2f3 /xorg-server/mi | |
| parent | 2c8d7aa6bda138693fa1827852ba6b75d1721ff8 (diff) | |
| parent | f0a7d1d88be0c31bd471f4428c4493a93f2d9321 (diff) | |
| download | vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.tar.gz vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.tar.bz2 vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/glxext.c
xorg-server/hw/xwin/InitOutput.c
Diffstat (limited to 'xorg-server/mi')
| -rw-r--r-- | xorg-server/mi/miinitext.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/xorg-server/mi/miinitext.c b/xorg-server/mi/miinitext.c index d95d0210f..ba593526c 100644 --- a/xorg-server/mi/miinitext.c +++ b/xorg-server/mi/miinitext.c @@ -112,13 +112,6 @@ SOFTWARE. #include "micmap.h" #include "globals.h" -#ifdef GLXEXT -typedef struct __GLXprovider __GLXprovider; -extern __GLXprovider __glXDRISWRastProvider; -extern void GlxPushProvider(__GLXprovider * impl); -extern void GlxExtensionInit(INITARGS); -#endif - /* The following is only a small first step towards run-time * configurable extensions. */ @@ -241,7 +234,7 @@ EnableDisableExtensionError(const char *name, Bool enable) } /* List of built-in (statically linked) extensions */ -static ExtensionModule staticExtensions[] = { +static const ExtensionModule staticExtensions[] = { {GEExtensionInit, "Generic Event Extension", &noGEExtension}, {ShapeExtensionInit, "SHAPE", NULL}, #ifdef MITSHM @@ -335,11 +328,6 @@ InitExtensions(int argc, char *argv[]) (ext->initFunc) (); } } -#ifdef GLXEXT - if (!noGlxExtension) - GlxExtensionInit(); - -#endif } static ExtensionModule * @@ -371,7 +359,7 @@ NewExtensionModule(void) } void -LoadExtension(ExtensionModule * e, Bool builtin) +LoadExtension(const ExtensionModule * e, Bool builtin) { ExtensionModule *newext; |