Fixed building on FreeBSD 8.x

diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c b/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c
index 35cc7269377b2ee00537723ad319a6ac0c16f10f..b7401409e29224bc3b4fb216e545d1b95b5873c2 100644 (file)
--- 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 649161df86aebc40072e37a1ae4c8547263e1536..3999de3decbc1d33f47f1777989fc3b00931c1fb 100644 (file)
--- 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 9e7b960eba2be365ff5037189f2581ca3c68c502..87fab04cc8ab78eb9f9f419780729d38e5229418 100644 (file)
--- 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 43173ba14a84f066714247046edc956a40e7ad0c..87e490a356fcf44be59ec98db87e93ba95133215 100644 (file)
--- 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 0a2cd86f0cd9b3e7260230c7681b42be867d7962..b36d2774f49766348d6f7a7aca84ba8dd14c4367 100644 (file)
--- 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>