merge XFree86 RC2 (4.3.99.902) from vendor branchXEVIE-BASE

2 files changed, 5 insertions, 9 deletions

diff --git a/dm.h b/dm.h
index 483ce20..a784ed4 100644
--- a/dm.h
+++ b/dm.h
@@ -1,3 +1,4 @@
+/* $XdotOrg: dm.h,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */
 /* $Xorg: dm.h,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */
 /*
 
@@ -26,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/dm.h,v 3.33 2003/11/19 03:57:10 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/dm.h,v 3.34 2003/12/12 03:20:45 dawes Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -510,11 +511,6 @@ extern void ProcessRequestSocket(int fd);
 #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);
diff --git a/genauth.c b/genauth.c
index 20383c9..247b6c0 100644
--- a/genauth.c
+++ b/genauth.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: genauth.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */
+/* $XdotOrg: xc/programs/xdm/genauth.c,v 1.1.4.4 2003/12/06 13:24:29 kaleb Exp $ */
 /* $Xorg: genauth.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */
 /*
 
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/genauth.c,v 3.21 2003/11/26 07:33:10 herrb Exp $ */
+/* $XFree86: xc/programs/xdm/genauth.c,v 3.22 2003/12/18 16:38:39 dawes Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -347,7 +347,7 @@ AddPreGetEntropy (void)
 static void
 InitXdmcpWrapper (void)
 {
-    u_int32_t sum[4];
+    uint32_t sum[4];
 
 #ifdef	ARC4_RANDOM
     sum[0] = arc4random();