xserver: Branch 'master'

[Greg Kroah-Hartman]

 Xprint/Init.c  |    5 +----
 mi/miinitext.c |    4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
diff-tree 40fb7eecaf14a76f35ac2dc350ad2fffdaf6e0d0 (from 494895e0fbbf0a71bc535c0a2358c9db54c95c5a)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Jun 8 10:11:17 2006 -0700

    fix noDamageExtension warning in Xprint/Init.c
    
    Also took out duplicate definition of this variable in mi/miinitext.c

diff --git a/Xprint/Init.c b/Xprint/Init.c
index 50fa471..1df8998 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -308,10 +308,7 @@ void PrinterInitGlobals(void)
      * https://bugs.freedesktop.org/show_bug.cgi?id=1660) ...
      * (you can enable the DAMAGE extension explicitly via
      * % X +extension DAMAGE ... #) ;-( */
-    {
-      extern Bool noDamageExtension;
-      noDamageExtension = TRUE;
-    }
+    noDamageExtension = TRUE;
 #endif /* DAMAGE */
 
 #ifdef SMART_SCHEDULE
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 7626c84..170efed 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -85,6 +85,7 @@ SOFTWARE.
 #include "misc.h"
 #include "extension.h"
 #include "micmap.h"
+#include "globals.h"
 
 #if defined(QNX4) /* sleaze for Watcom on QNX4 ... */
 #undef GLXEXT
@@ -125,9 +126,6 @@ extern Bool noBigReqExtension;
 #ifdef COMPOSITE
 extern Bool noCompositeExtension;
 #endif
-#ifdef DAMAGE
-extern Bool noDamageExtension;
-#endif
 #ifdef DBE
 extern Bool noDbeExtension;
 #endif