diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-07-27 19:02:39 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-07-27 19:02:39 +0000 |
| commit | 269d40cbcc43b41f621ca6d91c182952f60ec48e (patch) | |
| tree | 872f2fddd3f2207e57a28595e73886713ce4a77a /xserver/os/osdep.h | |
| parent | 917a2249b787451cad3f9697872aeccfd0da3324 (diff) | |
Update to xserver 1.8. Tested by many. Ok oga@, todd@.
Diffstat (limited to 'xserver/os/osdep.h')
| -rw-r--r-- | xserver/os/osdep.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xserver/os/osdep.h b/xserver/os/osdep.h index e719f9a70..7b1c69995 100644 --- a/xserver/os/osdep.h +++ b/xserver/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; @@ -196,7 +200,7 @@ extern int *ConnectionTranslation; #else extern int GetConnectionTranslation(int conn); extern void SetConnectionTranslation(int conn, int client); -extern void ClearConnectionTranslation(); +extern void ClearConnectionTranslation(void); #endif extern Bool NewOutputPending; @@ -204,7 +208,7 @@ extern Bool AnyClientsWriteBlocked; extern WorkQueuePtr workQueue; -/* added by raphael */ +/* in WaitFor.c */ #ifdef WIN32 typedef long int fd_mask; #endif @@ -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); |