From d51814d4bd9dcede1433ab3146e93157dd731f4f Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 30 May 2025 15:38:52 +0200 Subject: [PATCH] os: move xdm function vector types from osdep.h to xdmcp.h These are only needed in xdmcp.h, so move them there. Signed-off-by: Enrico Weigelt, metux IT consult --- os/osdep.h | 7 ------- os/xdmcp.h | 7 +++++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/os/osdep.h b/os/osdep.h index 94a1f486d..5a8117d78 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -81,13 +81,6 @@ SOFTWARE. #define ETEST(err) (err == EAGAIN || err == WSAEWOULDBLOCK) #endif -#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, const char *name, - unsigned data_length, char *data); -#endif - typedef struct _connectionInput *ConnectionInputPtr; typedef struct _connectionOutput *ConnectionOutputPtr; diff --git a/os/xdmcp.h b/os/xdmcp.h index 50f5f2d57..8e14396e1 100644 --- a/os/xdmcp.h +++ b/os/xdmcp.h @@ -3,7 +3,11 @@ #include "osdep.h" -#ifdef XDMCP +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, const char *name, + unsigned data_length, char *data); + /* in xdmcp.c */ void XdmcpUseMsg(void); int XdmcpOptions(int argc, char **argv, int i); @@ -24,6 +28,5 @@ void XdmcpRegisterAuthentication(const char *name, struct sockaddr_in; void XdmcpRegisterBroadcastAddress(const struct sockaddr_in *addr); -#endif /* XDMCP */ #endif /* _XSERVER_OS_XDMCP_H */