xserver: Branch 'master'

[Greg Kroah-Hartman]

 hw/xprint/DiPrint.h |    5 +++++
 1 files changed, 5 insertions(+)

New commits:
diff-tree 77aa701e898c6525322cc4029d95167dd9f6e618 (from 865884d050e1778180f7677e15f9ee1625ea4bb2)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 21 14:16:48 2006 -0700

    add some function prototypes to hw/xprint/DiPrint.h as they are exported

diff --git a/hw/xprint/DiPrint.h b/hw/xprint/DiPrint.h
index a264779..6801ce0 100644
--- a/hw/xprint/DiPrint.h
+++ b/hw/xprint/DiPrint.h
@@ -41,6 +41,7 @@ copyright holders.
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include <X11/fonts/fontstruct.h>
 
 #ifndef _XpDiPrint_H_
 #define _XpDiPrint_H_ 1
@@ -74,6 +75,10 @@ extern void PrinterInitGlobals(void);
 
 extern void PrinterInitOutput(ScreenInfo *pScreenInfo, int argc, char **argv);
 
+extern Bool XpClientIsPrintClient(ClientPtr client, FontPathElementPtr fpe);
+
+extern Bool XpClientIsBitmapClient(ClientPtr client);
+
 extern void _XpVoidNoop(void);
 
 extern Bool _XpBoolNoop(void);