xserver: Branch 'master'

[Greg Kroah-Hartman]

 hw/xfree86/common/xf86Config.c |    4 +---
 include/extension.h            |    4 ++++
 os/utils.c                     |    5 +----
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
diff-tree 9fa73721f0c3df73e508da909a5665f47a54cb57 (from c405659626477f2009603d8c0e381b8b62277bb6)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Jun 8 10:27:28 2006 -0700

    fix up EnableDisableExtension() and EnableDisableExtensionError() prototypes

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 2cb4754..36dde30 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -67,6 +67,7 @@
 #include "xf86_OSlib.h"
 
 #include "globals.h"
+#include "extension.h"
 
 #ifdef XINPUT
 #include "xf86Xinput.h"
@@ -2524,9 +2525,6 @@ configDRI(XF86ConfDRIPtr drip)
 }
 #endif
 
-/* Extension enable/disable in miinitext.c */
-extern Bool EnableDisableExtension(char *name, Bool enable);
-
 static Bool
 configExtensions(XF86ConfExtensionsPtr conf_ext)
 {
diff --git a/include/extension.h b/include/extension.h
index 3475017..613076d 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -56,6 +56,10 @@ extern unsigned short StandardMinorOpcod
 
 extern unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/);
 
+extern Bool EnableDisableExtension(char *name, Bool enable);
+
+extern void EnableDisableExtensionError(char *name, Bool enable);
+
 extern void InitExtensions(int argc, char **argv);
 
 extern void InitVisualWrap(void);
diff --git a/os/utils.c b/os/utils.c
index 8655c3e..43c6365 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -72,6 +72,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include "input.h"
 #include "dixfont.h"
 #include "osdep.h"
+#include "extension.h"
 #ifdef X_POSIX_C_SOURCE
 #define _POSIX_C_SOURCE X_POSIX_C_SOURCE
 #include <signal.h>
@@ -287,10 +288,6 @@ int userdefinedfontpath = 0;
 
 char *dev_tty_from_init = NULL;		/* since we need to parse it anyway */
 
-/* Extension enable/disable in miinitext.c */
-extern Bool EnableDisableExtension(char *name, Bool enable);
-extern void EnableDisableExtensionError(char *name, Bool enable);
-
 OsSigHandlerPtr
 OsSignal(sig, handler)
     int sig;