xserver: Branch 'master'

[Greg Kroah-Hartman]

 Xprint/Init.c |    2 --
 include/dix.h |    1 +
 os/utils.c    |    2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

New commits:
diff-tree 494895e0fbbf0a71bc535c0a2358c9db54c95c5a (from d90eecf40ea768b2bf6340f15bb0af9dab2f3cf3)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Jun 8 09:43:44 2006 -0700

    Properly define dispatchExceptionAtReset to fix compiler warnings

diff --git a/Xprint/Init.c b/Xprint/Init.c
index 9fba6c5..50fa471 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -300,8 +300,6 @@ static Bool xprintInitGlobalsCalled = FA
  */
 void PrinterInitGlobals(void)
 {
-    extern char dispatchExceptionAtReset; /* defined in Xserver/dix/dispatch.c */
-
     xprintInitGlobalsCalled = TRUE;
 
 #ifdef DAMAGE
diff --git a/include/dix.h b/include/dix.h
index 7a4f49d..0177721 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -294,6 +294,7 @@ extern ClientPtr requestingClient;
 extern ClientPtr *clients;
 extern ClientPtr serverClient;
 extern int currentMaxClients;
+extern char dispatchExceptionAtReset;
 
 typedef int HWEventQueueType;
 typedef HWEventQueueType* HWEventQueuePtr;
diff --git a/os/utils.c b/os/utils.c
index bfbc367..8655c3e 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -287,8 +287,6 @@ int userdefinedfontpath = 0;
 
 char *dev_tty_from_init = NULL;		/* since we need to parse it anyway */
 
-extern char dispatchExceptionAtReset;
-
 /* Extension enable/disable in miinitext.c */
 extern Bool EnableDisableExtension(char *name, Bool enable);
 extern void EnableDisableExtensionError(char *name, Bool enable);