xserver: Branch 'master'

[Greg Kroah-Hartman]

 Xprint/ps/Ps.h       |    1 +
 Xprint/ps/PsPixmap.c |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
diff-tree 2dc291384c550badf55542ae645240e166676848 (from aef092e0290143c2b8b1cb98fdf55c9630032aaf)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Jun 8 11:04:40 2006 -0700

    fixed compiler warnings in Xprint/ps/PsPixmap.c

diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h
index 781161d..576c3b2 100644
--- a/Xprint/ps/Ps.h
+++ b/Xprint/ps/Ps.h
@@ -569,6 +569,7 @@ extern PixmapPtr PsCreatePixmap(ScreenPt
 extern void PsScrubPixmap(PixmapPtr pPixmap);
 extern Bool PsDestroyPixmap(PixmapPtr pPixmap);
 extern DisplayListPtr PsGetFreeDisplayBlock(PsPixmapPrivPtr priv);
+extern void PsReplay(DisplayElmPtr elm, DrawablePtr pDrawable);
 extern void PsReplayPixmap(PixmapPtr pix, DrawablePtr pDrawable);
 extern int PsCloneDisplayElm(PixmapPtr dst,
 			     DisplayElmPtr elm, DisplayElmPtr newElm,
diff --git a/Xprint/ps/PsPixmap.c b/Xprint/ps/PsPixmap.c
index a698b37..f2d05d0 100644
--- a/Xprint/ps/PsPixmap.c
+++ b/Xprint/ps/PsPixmap.c
@@ -191,7 +191,6 @@ Bool
 PsDestroyPixmap(PixmapPtr pPixmap)
 {
   PsPixmapPrivPtr priv = (PsPixmapPrivPtr)pPixmap->devPrivate.ptr;
-  DisplayListPtr  disp = priv->dispList;
 
   if( --pPixmap->refcnt ) return TRUE;
 
@@ -512,6 +511,8 @@ PsCreateFillElementList(PixmapPtr pix, i
         case PolyFillArcCmd:
           *nElms += elm->c.arcs.nArcs;
           break;
+        default: /* keep the compiler happy with unhandled enums */
+          break;
       }
     }
   }
@@ -574,6 +575,8 @@ PsCreateFillElementList(PixmapPtr pix, i
                 *nElms += 1;
               }
               break;
+            default:  /* keep the compiler happy with unhandled enums */
+              break;
           }
         }
       }