Fixes for dtlogin and dtcm on FreeBSD.

cde/programs/dtlogin/account.c

@@ -57,7 +57,12 @@
 #endif
 
 #include	<fcntl.h>
+#if defined(__FreeBSD__)
+#include	<utmpx.h>
+#else
 #include	<utmp.h>
+#endif
+
 #include	<time.h>
 #include	"dm.h"
 

cde/programs/dtlogin/dm.c

@@ -1697,8 +1697,13 @@ GettyMessage( struct display *d, int msgnum )
 int 
 GettyRunning( struct display *d )
 {
+#if defined(__FreeBSD__)
+    struct utmpx utmp;		/* local struct for new entry		   */
+    struct utmpx *u;		/* pointer to entry in utmp file	   */
+#else
     struct utmp utmp;		/* local struct for new entry	   	   */
     struct utmp *u;		/* pointer to entry in utmp file	   */
+#endif
     
     int		rvalue;		/* return value (TRUE or FALSE)		   */
     char	buf[32];
@@ -1717,7 +1722,11 @@ GettyRunning( struct display *d )
         return FALSE;
 
 
+#if defined(__FreeBSD__)
+    bzero(&utmp, sizeof(struct utmpx));
+#else
     bzero(&utmp, sizeof(struct utmp));
+#endif
 
 #ifdef _AIX
    if (!strcmp(d->gettyLine,"console")) {

cde/programs/dtlogin/fontpath.c

@@ -39,7 +39,11 @@
 # include <signal.h>
 # include <X11/Xatom.h>
 # include <setjmp.h>
+#if defined(__FreeBSD__)
+# include <utmpx.h>
+#else
 # include <utmp.h>
+#endif
 # include "vgproto.h"
 
 /* 

cde/programs/dtlogin/session.c

@@ -65,7 +65,11 @@
 # include <signal.h>
 # include <X11/Xatom.h>
 # include <setjmp.h>
+#if defined(__FreeBSD__)
+# include <utmpx.h>
+#else
 # include <utmp.h>
+#endif
 #include <unistd.h>
 #include <pwd.h>
 #include <dirent.h>