xserver: Branch 'master'

[Greg Kroah-Hartman]

 Xprint/ps/Ps.h      |    8 ++++++++
 Xprint/ps/PsCache.c |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

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

    add proper function prototypes for Xprint/ps/PsCache.c to Xprint/ps/Ps.h

diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h
index 68c95f9..4effc20 100644
--- a/Xprint/ps/Ps.h
+++ b/Xprint/ps/Ps.h
@@ -357,6 +357,14 @@ extern Bool InitializePsDriver(int ndx, 
 extern XpContextPtr PsGetContextFromWindow(WindowPtr win);
 
 /*
+ *  Functions in PsCache.c
+ */
+
+extern int PsBmIsImageCached(int gWidth, int gHeight, char *pBuffer);
+extern int PsBmPutImageInCache(int gWidth, int gHeight, char *pBuffer);
+extern void PsBmClearImageCache(void);
+
+/*
  *  Functions in PsPrint.c
  */
 
diff --git a/Xprint/ps/PsCache.c b/Xprint/ps/PsCache.c
index e69aa2e..5c823a1 100644
--- a/Xprint/ps/PsCache.c
+++ b/Xprint/ps/PsCache.c
@@ -317,7 +317,7 @@ PsBmClearImageCacheList(
 }
 
 void
-PsBmClearImageCache()
+PsBmClearImageCache(void)
 {
    PsBmClearImageCacheList(bm_cache);