xserver: Branch 'master'

[Greg Kroah-Hartman]

 Xprint/ps/Ps.h     |    3 +++
 Xprint/ps/PsArea.c |    2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
diff-tree ee2bb4d1929e20436cf0e830ece02fe07db2d524 (from 92303d534a91cb0ea30e4cd0f639efd70b9739b4)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Jun 8 11:15:34 2006 -0700

    fix compiler warnings in Xprint/ps/PsArea.c

diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h
index 576c3b2..68c95f9 100644
--- a/Xprint/ps/Ps.h
+++ b/Xprint/ps/Ps.h
@@ -427,6 +427,9 @@ extern void PsSetSpans(DrawablePtr pDraw
 extern void PsPutScaledImage(DrawablePtr pDrawable, GCPtr pGC, int depth,
                        int x, int y, int w, int h, int leftPad, int format,
                        int imageRes, char *pImage);
+extern void PsPutScaledImageIM(DrawablePtr pDrawable, GCPtr pGC, int depth,
+                               int x, int y, int w, int h, int leftPad,
+                               int format, int imageRes, char *pImage);
 extern void PsPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth,
                        int x, int y, int w, int h, int leftPad, int format,
                        char *pImage);
diff --git a/Xprint/ps/PsArea.c b/Xprint/ps/PsArea.c
index 32a4d5c..bf6f8f4 100644
--- a/Xprint/ps/PsArea.c
+++ b/Xprint/ps/PsArea.c
@@ -118,7 +118,6 @@ PsPutScaledImage(DrawablePtr pDrawable, 
   {
     int          i, j;
     int          r, c;
-    char        *pt;
     PsOutPtr     psOut;
     ColormapPtr  cMap;
     int          pageRes, sw, sh;
@@ -230,7 +229,6 @@ PsPutScaledImageIM(DrawablePtr pDrawable
   {
     int          i, j;
     int          r, c;
-    char        *pt;
     PsOutPtr     psOut;
     ColormapPtr  cMap;
     int          pageRes, sw, sh;