From 40fb7eecaf14a76f35ac2dc350ad2fffdaf6e0d0 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 8 Jun 2006 10:11:17 -0700
Subject: [PATCH] fix noDamageExtension warning in Xprint/Init.c

Also took out duplicate definition of this variable in mi/miinitext.c
---
 Xprint/Init.c  | 5 +----
 mi/miinitext.c | 4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Xprint/Init.c b/Xprint/Init.c
index 50fa4716c..1df8998eb 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 7626c8494..170efed93 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