xserver: Branch 'master'

[Greg Kroah-Hartman]

 Xprint/ps/psout.c |    8 ++++----
 Xprint/ps/psout.h |    1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
diff-tree 3930da3f6209312dd0f10aba0b16ef45996a07fe (from c496a3b9c981dc079fcc6c0ac4db3aa912b3dcf1)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Jun 8 11:27:29 2006 -0700

    fix compiler warnings in Xprint/ps/psout.c

diff --git a/Xprint/ps/psout.c b/Xprint/ps/psout.c
index 376feec..d7f45b1 100644
--- a/Xprint/ps/psout.c
+++ b/Xprint/ps/psout.c
@@ -683,7 +683,6 @@ void
 PsOut_EndFile(PsOutPtr self, int closeFile)
 {
   char coms[50];
-  int  i;
   
   if (!self)
     return;
@@ -1592,7 +1591,8 @@ PsOut_BeginPattern(PsOutPtr self, void *
   switch(type) {
     case PsTile:   key[1] = 't'; break;
     case PsStip:   key[1] = 's'; break;
-    case PsOpStip: key[1] = 'o'; break; }
+    case PsOpStip: key[1] = 'o'; break;
+    default: break; }
   S_OutTok(self, key, 0);
   S_OutTok(self, "db/PatternType 1 d/PaintType 1 d", 0);
   S_OutTok(self, "/TilingType 1 d/BBox[0 0", 0);
@@ -1637,7 +1637,8 @@ PsOut_SetPattern(PsOutPtr self, void *ta
   switch(type) {
     case PsTile:   key[0] = 't'; break;
     case PsStip:   key[0] = 's'; break;
-    case PsOpStip: key[0] = 'o'; break; }
+    case PsOpStip: key[0] = 'o'; break;
+    default: break; }
   S_OutTok(self, key, 0);
   S_OutTok(self, "spt", 1);
   self->CurColor = PSOUTCOLOR_NOCOLOR;
@@ -1663,7 +1664,6 @@ typedef enum PsDownfontFontType_  
 int
 PsOut_DownloadType1(PsOutPtr self, const char *auditmsg, const char *name, const char *fname)
 {
-  int     i;
   int     stt;
   char    buf[256];
   FILE   *fp;
diff --git a/Xprint/ps/psout.h b/Xprint/ps/psout.h
index 8441d8d..d998e2a 100644
--- a/Xprint/ps/psout.h
+++ b/Xprint/ps/psout.h
@@ -267,6 +267,7 @@ extern void S_OutTok(PsOutPtr self, char
 typedef struct PsOutRec_ *PsOutPtr;
 #endif /* USE_PSOUT_PRIVATE */
 
+extern FILE * PsOut_ChangeFile(PsOutPtr self, FILE *fp);
 extern PsOutPtr PsOut_BeginFile(FILE *fp, char *title, int orient, int count, int plex,
                                 int res, int wd, int ht, Bool raw);
 extern void PsOut_EndFile(PsOutPtr self, int closeFile);