xserver: Branch 'master'

[Greg Kroah-Hartman]

 dix/xpstubs.c |    3 +++
 1 files changed, 3 insertions(+)

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

    fix compiler warning in dix/xpstubs.c when XPRINT is not defined

diff --git a/dix/xpstubs.c b/dix/xpstubs.c
index 5135cc3..c06a524 100644
--- a/dix/xpstubs.c
+++ b/dix/xpstubs.c
@@ -35,6 +35,9 @@ from The Open Group.
 #include <X11/fonts/font.h>
 #ifdef XPRINT
 #include "DiPrint.h"
+#else
+extern Bool XpClientIsBitmapClient(ClientPtr client);
+extern Bool XpClientIsPrintClient(ClientPtr client, FontPathElementPtr fpe);
 #endif
 
 Bool