Bug 16832: XDMCP related build error when --disable-xdmcp is used
X.Org Bugzilla #16832: http://bugs.freedesktop.org/show_bug.cgi?id=16832 Patch #27279: http://bugs.freedesktop.org/attachment.cgi?id=27279
This commit is contained in:
		
							parent
							
								
									b159a98f7f
								
							
						
					
					
						commit
						736f2d6472
					
				|  | @ -56,7 +56,9 @@ SOFTWARE. | ||||||
| #define BUFSIZE 4096 | #define BUFSIZE 4096 | ||||||
| #define BUFWATERMARK 8192 | #define BUFWATERMARK 8192 | ||||||
| 
 | 
 | ||||||
|  | #if defined(XDMCP) || defined(HASXDMAUTH) | ||||||
| #include <X11/Xdmcp.h> | #include <X11/Xdmcp.h> | ||||||
|  | #endif | ||||||
| 
 | 
 | ||||||
| #ifdef _POSIX_SOURCE | #ifdef _POSIX_SOURCE | ||||||
| #include <limits.h> | #include <limits.h> | ||||||
|  | @ -109,9 +111,11 @@ SOFTWARE. | ||||||
| 
 | 
 | ||||||
| #include <stddef.h> | #include <stddef.h> | ||||||
| 
 | 
 | ||||||
|  | #if defined(XDMCP) || defined(HASXDMAUTH) | ||||||
| typedef Bool (*ValidatorFunc)(ARRAY8Ptr Auth, ARRAY8Ptr Data, int packet_type); | typedef Bool (*ValidatorFunc)(ARRAY8Ptr Auth, ARRAY8Ptr Data, int packet_type); | ||||||
| typedef Bool (*GeneratorFunc)(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); | typedef Bool (*AddAuthorFunc)(unsigned name_length, char *name, unsigned data_length, char *data); | ||||||
|  | #endif | ||||||
| 
 | 
 | ||||||
| typedef struct _connectionInput { | typedef struct _connectionInput { | ||||||
|     struct _connectionInput *next; |     struct _connectionInput *next; | ||||||
|  | @ -244,6 +248,7 @@ extern int  SecureRPCRemove   (AuthRemCArgs); | ||||||
| extern int  SecureRPCReset    (AuthRstCArgs); | extern int  SecureRPCReset    (AuthRstCArgs); | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
|  | #ifdef XDMCP | ||||||
| /* in xdmcp.c */ | /* in xdmcp.c */ | ||||||
| extern void XdmcpUseMsg (void); | extern void XdmcpUseMsg (void); | ||||||
| extern int XdmcpOptions(int argc, char **argv, int i); | extern int XdmcpOptions(int argc, char **argv, int i); | ||||||
|  | @ -268,6 +273,7 @@ extern void XdmcpRegisterAuthentication ( | ||||||
| 
 | 
 | ||||||
| struct sockaddr_in; | struct sockaddr_in; | ||||||
| extern void XdmcpRegisterBroadcastAddress (struct sockaddr_in *addr); | extern void XdmcpRegisterBroadcastAddress (struct sockaddr_in *addr); | ||||||
|  | #endif | ||||||
| 
 | 
 | ||||||
| #ifdef HASXDMAUTH | #ifdef HASXDMAUTH | ||||||
| extern void XdmAuthenticationInit (char *cookie, int cookie_length); | extern void XdmAuthenticationInit (char *cookie, int cookie_length); | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue