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 <info@metux.net>
This commit is contained in:
		
							parent
							
								
									d5dc80aebe
								
							
						
					
					
						commit
						d51814d4bd
					
				| 
						 | 
					@ -81,13 +81,6 @@ SOFTWARE.
 | 
				
			||||||
#define ETEST(err) (err == EAGAIN || err == WSAEWOULDBLOCK)
 | 
					#define ETEST(err) (err == EAGAIN || err == WSAEWOULDBLOCK)
 | 
				
			||||||
#endif
 | 
					#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 _connectionInput *ConnectionInputPtr;
 | 
				
			||||||
typedef struct _connectionOutput *ConnectionOutputPtr;
 | 
					typedef struct _connectionOutput *ConnectionOutputPtr;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,11 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "osdep.h"
 | 
					#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 */
 | 
					/* in xdmcp.c */
 | 
				
			||||||
void XdmcpUseMsg(void);
 | 
					void XdmcpUseMsg(void);
 | 
				
			||||||
int XdmcpOptions(int argc, char **argv, int i);
 | 
					int XdmcpOptions(int argc, char **argv, int i);
 | 
				
			||||||
| 
						 | 
					@ -24,6 +28,5 @@ void XdmcpRegisterAuthentication(const char *name,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct sockaddr_in;
 | 
					struct sockaddr_in;
 | 
				
			||||||
void XdmcpRegisterBroadcastAddress(const struct sockaddr_in *addr);
 | 
					void XdmcpRegisterBroadcastAddress(const struct sockaddr_in *addr);
 | 
				
			||||||
#endif /* XDMCP */
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif /* _XSERVER_OS_XDMCP_H */
 | 
					#endif /* _XSERVER_OS_XDMCP_H */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue