xserver: Branch 'master' - 3 commits

[Greg Kroah-Hartman]

 Xprint/ddxInit.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree bccde1609153dee93f6fe5a138fc0c0f2fe08212 (from 60bd8893d50ed1da9b94f4b96a07ea432e23f467)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Jun 8 09:01:59 2006 -0700

    fix incompatible pointer warning in Xprint/ddxInit.c

diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c
index 844cba1..29e7c98 100644
--- a/Xprint/ddxInit.c
+++ b/Xprint/ddxInit.c
@@ -177,7 +177,7 @@ InitInput(
      int       argc,
      char **argv)
 {
-    DevicePtr ptr, kbd;
+    DeviceIntPtr ptr, kbd;
 
     ptr = AddInputDevice((DeviceProc)PointerProc, TRUE);
     kbd = AddInputDevice((DeviceProc)KeyboardProc, TRUE);
diff-tree 60bd8893d50ed1da9b94f4b96a07ea432e23f467 (from ac21e6a594eac69101aa8920d70a9d60412b57f6)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Jun 8 09:01:21 2006 -0700

    Properly #ifdef out ddxBeforeReset() to fix compiler warning

diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c
index 0de38cd..844cba1 100644
--- a/Xprint/ddxInit.c
+++ b/Xprint/ddxInit.c
@@ -237,11 +237,13 @@ OsVendorFatalError(void)
 }
 #endif
 
+#ifdef DDXBEFORERESET
 void
 ddxBeforeReset(void)
 {
     return;
 }
+#endif
 
 #ifdef DDXTIME
 CARD32
diff-tree ac21e6a594eac69101aa8920d70a9d60412b57f6 (from 71dd44b0ad617dd36ce4ed328f9e1e8c5ef713a5)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Jun 8 09:00:42 2006 -0700

    remove unused variable warning in Xprint/ddxInit.c

diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c
index 67035e5..0de38cd 100644
--- a/Xprint/ddxInit.c
+++ b/Xprint/ddxInit.c
@@ -76,8 +76,6 @@ InitOutput(
     char         **argv)
 
 {
-    int i;
-
     pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
     pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
     pScreenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;