From 69997241c500635332523e3db321c52ddde440aa Mon Sep 17 00:00:00 2001
From: Karsten Pedersen <kpedersen@hotmail.co.uk>
Date: Tue, 26 Feb 2013 19:12:35 +0000
Subject: [PATCH] Fixed building on FreeBSD 8.x

---
 cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c | 2 ++
 cde/programs/dtlogin/account.c            | 2 +-
 cde/programs/dtlogin/dm.c                 | 6 +++---
 cde/programs/dtlogin/fontpath.c           | 2 +-
 cde/programs/dtlogin/session.c            | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c b/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c
index 35cc7269..b7401409 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c
@@ -61,7 +61,9 @@ static char rcs_id[] = "$TOG: TermPrimSetUtmp.c /main/10 1998/04/03 17:11:42 mgr
 #endif	/* sun */
 
 #ifdef	__FreeBSD__
+#if OSMAJORVERSION > 8
 #define	UT_UTMPX
+#endif
 #define	UT_HOST		ut_host
 #define	UT_NO_pututline
 #endif
diff --git a/cde/programs/dtlogin/account.c b/cde/programs/dtlogin/account.c
index 649161df..3999de3d 100644
--- a/cde/programs/dtlogin/account.c
+++ b/cde/programs/dtlogin/account.c
@@ -57,7 +57,7 @@
 #endif
 
 #include	<fcntl.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) && OSMAJORVERSION > 8
 #include	<utmpx.h>
 #else
 #include	<utmp.h>
diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c
index 9e7b960e..87fab04c 100644
--- a/cde/programs/dtlogin/dm.c
+++ b/cde/programs/dtlogin/dm.c
@@ -53,7 +53,7 @@
 
 # include	<sys/signal.h>
 # include	<sys/stat.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) && OSMAJORVERSION > 8
 # include	<utmpx.h>
 #else
 # include	<utmp.h>
@@ -1697,7 +1697,7 @@ GettyMessage( struct display *d, int msgnum )
 int 
 GettyRunning( struct display *d )
 {
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) && OSMAJORVERSION > 8
     struct utmpx utmp;		/* local struct for new entry		   */
     struct utmpx *u;		/* pointer to entry in utmp file	   */
 #else
@@ -1722,7 +1722,7 @@ GettyRunning( struct display *d )
         return FALSE;
 
 
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) && OSMAJORVERSION > 8
     bzero(&utmp, sizeof(struct utmpx));
 #else
     bzero(&utmp, sizeof(struct utmp));
diff --git a/cde/programs/dtlogin/fontpath.c b/cde/programs/dtlogin/fontpath.c
index 43173ba1..87e490a3 100644
--- a/cde/programs/dtlogin/fontpath.c
+++ b/cde/programs/dtlogin/fontpath.c
@@ -39,7 +39,7 @@
 # include <signal.h>
 # include <X11/Xatom.h>
 # include <setjmp.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) && OSMAJORVERSION > 8
 # include <utmpx.h>
 #else
 # include <utmp.h>
diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c
index 0a2cd86f..b36d2774 100644
--- a/cde/programs/dtlogin/session.c
+++ b/cde/programs/dtlogin/session.c
@@ -65,7 +65,7 @@
 # include <signal.h>
 # include <X11/Xatom.h>
 # include <setjmp.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) && OSMAJORVERSION > 8
 # include <utmpx.h>
 #else
 # include <utmp.h>
-- 
2.25.1