xserver: Branch 'master'

[Greg Kroah-Hartman]

 os/access.c  |    3 +++
 os/io.c      |    3 +++
 os/utils.c   |    3 +++
 os/xdmauth.c |    9 ++++++---
 4 files changed, 15 insertions(+), 3 deletions(-)

New commits:
diff-tree 40aafaf154ba8a2cba857689d1481be2d4a610c2 (from 77aa701e898c6525322cc4029d95167dd9f6e618)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jun 21 14:36:09 2006 -0700

    fix a number of compiler warnings in os/*

diff --git a/os/access.c b/os/access.c
index db52aa0..5946b16 100644
--- a/os/access.c
+++ b/os/access.c
@@ -67,6 +67,9 @@ SOFTWARE.
 
 #include <stdio.h>
 #include <stdlib.h>
+#define XSERV_t
+#define TRANS_SERVER
+#define TRANS_REOPEN
 #include <X11/Xtrans/Xtrans.h>
 #include <X11/Xauth.h>
 #include <X11/X.h>
diff --git a/os/io.c b/os/io.c
index a9527ba..e95f0e6 100644
--- a/os/io.c
+++ b/os/io.c
@@ -66,6 +66,9 @@ SOFTWARE.
 #include <X11/Xwinsock.h>
 #endif
 #include <stdio.h>
+#define XSERV_t
+#define TRANS_SERVER
+#define TRANS_REOPEN
 #include <X11/Xtrans/Xtrans.h>
 #include <X11/Xmd.h>
 #include <errno.h>
diff --git a/os/utils.c b/os/utils.c
index f977b83..e41c366 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -68,6 +68,9 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include "misc.h"
 #include <X11/X.h>
+#define XSERV_t
+#define TRANS_SERVER
+#define TRANS_REOPEN
 #include <X11/Xtrans/Xtrans.h>
 #include "input.h"
 #include "dixfont.h"
diff --git a/os/xdmauth.c b/os/xdmauth.c
index 7742981..faa2e37 100644
--- a/os/xdmauth.c
+++ b/os/xdmauth.c
@@ -41,6 +41,9 @@ from The Open Group.
 
 #include <stdio.h>
 #include <X11/X.h>
+#define XSERV_t
+#define TRANS_SERVER
+#define TRANS_REOPEN
 #include <X11/Xtrans/Xtrans.h>
 #include "os.h"
 #include "osdep.h"
@@ -153,9 +156,9 @@ XdmAuthenticationInit (char *cookie, int
     XdmcpRegisterAuthentication (XdmAuthenticationName, XdmAuthenticationNameLen,
 				 (unsigned char *)&rho,
 				 sizeof (rho),
-				 XdmAuthenticationValidator,
-				 XdmAuthenticationGenerator,
-				 XdmAuthenticationAddAuth);
+				 (ValidatorFunc)XdmAuthenticationValidator,
+				 (GeneratorFunc)XdmAuthenticationGenerator,
+				 (AddAuthorFunc)XdmAuthenticationAddAuth);
 }
 
 #endif /* XDMCP */