Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/single2.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/os/osinit.c
	xorg-server/os/xdmcp.c
	xorg-server/xkb/xkbInit.c

1 files changed, 3 insertions, 3 deletions

diff --git a/xorg-server/mi/miinitext.c b/xorg-server/mi/miinitext.c
index 29903973f..3076e7b28 100644
--- a/xorg-server/mi/miinitext.c
+++ b/xorg-server/mi/miinitext.c
@@ -268,7 +268,7 @@ extern void GEExtensionInit(INITARGS);
  * configurable extensions.
  */
 typedef struct {
-    char *name;
+    const char *name;
     Bool *disablePtr;
 } ExtensionToggle;
 
@@ -337,7 +337,7 @@ static ExtensionToggle ExtensionToggleList[] =
     { NULL, NULL }
 };
 
-Bool EnableDisableExtension(char *name, Bool enable)
+Bool EnableDisableExtension(const char *name, Bool enable)
 {
     ExtensionToggle *ext = &ExtensionToggleList[0];
 
@@ -357,7 +357,7 @@ Bool EnableDisableExtension(char *name, Bool enable)
     return FALSE;
 }
 
-void EnableDisableExtensionError(char *name, Bool enable)
+void EnableDisableExtensionError(const char *name, Bool enable)
 {
     ExtensionToggle *ext = &ExtensionToggleList[0];
     Bool found = FALSE;