xserver: Branch 'master'

[Alan Coopersmith]

 os/osdep.h |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 736f2d64725c6df8413e627bd40ce7ecb011acc7
Author: Paul Bender <pebender at gmail.com>
Date:   Tue Jun 30 15:50:46 2009 -0800

    Bug 16832: XDMCP related build error when --disable-xdmcp is used
    
    X.Org Bugzilla #16832: http://bugs.freedesktop.org/show_bug.cgi?id=16832
    Patch #27279: http://bugs.freedesktop.org/attachment.cgi?id=27279

diff --git a/os/osdep.h b/os/osdep.h
index b0d30e9..3d75bba 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -56,7 +56,9 @@ SOFTWARE.
 #define BUFSIZE 4096
 #define BUFWATERMARK 8192
 
+#if defined(XDMCP) || defined(HASXDMAUTH)
 #include <X11/Xdmcp.h>
+#endif
 
 #ifdef _POSIX_SOURCE
 #include <limits.h>
@@ -109,9 +111,11 @@ SOFTWARE.
 
 #include <stddef.h>
 
+#if defined(XDMCP) || defined(HASXDMAUTH)
 typedef Bool (*ValidatorFunc)(ARRAY8Ptr Auth, ARRAY8Ptr Data, int packet_type);
 typedef Bool (*GeneratorFunc)(ARRAY8Ptr Auth, ARRAY8Ptr Data, int packet_type);
 typedef Bool (*AddAuthorFunc)(unsigned name_length, char *name, unsigned data_length, char *data);
+#endif
 
 typedef struct _connectionInput {
     struct _connectionInput *next;
@@ -244,6 +248,7 @@ extern int  SecureRPCRemove   (AuthRemCArgs);
 extern int  SecureRPCReset    (AuthRstCArgs);
 #endif
 
+#ifdef XDMCP
 /* in xdmcp.c */
 extern void XdmcpUseMsg (void);
 extern int XdmcpOptions(int argc, char **argv, int i);
@@ -268,6 +273,7 @@ extern void XdmcpRegisterAuthentication (
 
 struct sockaddr_in;
 extern void XdmcpRegisterBroadcastAddress (struct sockaddr_in *addr);
+#endif
 
 #ifdef HASXDMAUTH
 extern void XdmAuthenticationInit (char *cookie, int cookie_length);