XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16

1 files changed, 20 insertions, 2 deletions

diff --git a/dm.h b/dm.h
index 1df6f88..483ce20 100644
--- a/dm.h
+++ b/dm.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/dm.h,v 3.29 2002/05/31 18:46:10 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/dm.h,v 3.33 2003/11/19 03:57:10 dawes Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -186,6 +186,7 @@ struct display {
 	int		useChooser;	/* Run the chooser for this display */
 	ARRAY8		clientAddr;	/* for chooser picking */
 	CARD16		connectionType;	/* ... */
+	int		xdmcpFd;
 #endif
 	/* server management resources */
 	int		serverAttempts;	/* number of attempts at running X */
@@ -279,6 +280,7 @@ struct greet_info {
 #endif
 
 typedef void (*ChooserFunc)(CARD16 connectionType, ARRAY8Ptr addr, char *closure);
+typedef void (*ListenFunc)(ARRAY8Ptr addr, void **closure);
 
 struct verify_info {
 	int		uid;		/* user id */
@@ -318,7 +320,12 @@ extern int	removeDomainname;
 extern char	*keyFile;
 extern char	*accessFile;
 extern char	**exportList;
+#if !defined(ARC4_RANDOM)
 extern char	*randomFile;
+extern char	*prngdSocket;
+extern int	prngdPort;
+#endif
+
 extern char	*greeterLib;
 extern char	*willing;
 extern int	choiceTimeout;	/* chooser choice timeout */
@@ -352,6 +359,8 @@ extern int ForEachMatchingIndirectHost (ARRAY8Ptr clientAddress, CARD16 connecti
 extern int ScanAccessDatabase (void);
 extern int UseChooser (ARRAY8Ptr clientAddress, CARD16 connectionType);
 extern void ForEachChooserHost (ARRAY8Ptr clientAddress, CARD16 connectionType, ChooserFunc function, char *closure);
+extern void ForEachListenAddr(ListenFunc listenfunction,
+  ListenFunc mcastfcuntion, void **closure);
 
 /* in choose.c */
 extern ARRAY8Ptr IndirectChoice (ARRAY8Ptr clientAddress, CARD16 connectionType);
@@ -439,9 +448,12 @@ extern int StartServer (struct display *d);
 extern int WaitForServer (struct display *d);
 extern void ResetServer (struct display *d);
 
-/* socket.c */
+/* socket.c or streams.c */
 extern int GetChooserAddr (char *addr, int *lenp);
 extern void CreateWellKnownSockets (void);
+extern void UpdateListenSockets (void);
+extern void CloseListenSockets (void);
+extern void ProcessListenSockets (fd_set *readmask);
 
 /* in util.c */
 extern char *localHostname (void);
@@ -467,6 +479,7 @@ extern void WaitForChild (void);
 extern void WaitForSomething (void);
 extern void init_session_id(void);
 extern void registerHostname(char *name, int namelen);
+extern void ProcessRequestSocket(int fd);
 
 /*
  * CloseOnFork flags
@@ -497,6 +510,11 @@ extern void registerHostname(char *name, int namelen);
 #define Jmp_buf		sigjmp_buf
 #endif
 
+#ifndef HAS_SNPRINTF
+#include <X11/Xmu/SysUtil.h>
+#define snprintf XmuSnprintf
+#endif
+
 typedef SIGVAL (*SIGFUNC)(int);
 
 SIGVAL (*Signal(int, SIGFUNC Handler))(int);