xserver: Branch 'master'

[Michel Dänzer]

 include/os.h |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit f4e00b783d3f824058a5f140e6462142688f5116
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Tue Jan 13 11:03:27 2009 +0100

    Fix build with --enable-visibility --disable-xdmcp.

diff --git a/include/os.h b/include/os.h
index 417263a..df5c73a 100644
--- a/include/os.h
+++ b/include/os.h
@@ -352,14 +352,16 @@ extern _X_EXPORT void AccessUsingXdmcp(void);
 
 extern _X_EXPORT void DefineSelf(int /*fd*/);
 
+#if XDMCP
 extern _X_EXPORT void AugmentSelf(pointer /*from*/, int /*len*/);
 
+extern _X_EXPORT void RegisterAuthorizations(void);
+#endif
+
 extern _X_EXPORT void InitAuthorization(char * /*filename*/);
 
 /* extern int LoadAuthorization(void); */
 
-extern _X_EXPORT void RegisterAuthorizations(void);
-
 extern _X_EXPORT int AuthorizationFromID (
 	XID 		id,
 	unsigned short	*name_lenp,