summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-06-21 14:36:09 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-21 14:36:09 -0700
commit40aafaf154ba8a2cba857689d1481be2d4a610c2 (patch)
tree736a2973047f147f2e9b01c2dbc678f0cbf17a19 /os
parent77aa701e898c6525322cc4029d95167dd9f6e618 (diff)
fix a number of compiler warnings in os/*
Diffstat (limited to 'os')
-rw-r--r--os/access.c3
-rw-r--r--os/io.c3
-rw-r--r--os/utils.c3
-rw-r--r--os/xdmauth.c9
4 files changed, 15 insertions, 3 deletions
diff --git a/os/access.c b/os/access.c
index db52aa038..5946b166d 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 a9527baa3..e95f0e6a8 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 f977b837c..e41c3664b 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 774298133..faa2e3799 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 cookie_len)
XdmcpRegisterAuthentication (XdmAuthenticationName, XdmAuthenticationNameLen,
(unsigned char *)&rho,
sizeof (rho),
- XdmAuthenticationValidator,
- XdmAuthenticationGenerator,
- XdmAuthenticationAddAuth);
+ (ValidatorFunc)XdmAuthenticationValidator,
+ (GeneratorFunc)XdmAuthenticationGenerator,
+ (AddAuthorFunc)XdmAuthenticationAddAuth);
}
#endif /* XDMCP */