diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c b/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c index 35cc72693..b7401409e 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 649161df8..3999de3de 100644 --- a/cde/programs/dtlogin/account.c +++ b/cde/programs/dtlogin/account.c @@ -57,7 +57,7 @@ #endif #include -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) && OSMAJORVERSION > 8 #include #else #include diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c index 9e7b960eb..87fab04cc 100644 --- a/cde/programs/dtlogin/dm.c +++ b/cde/programs/dtlogin/dm.c @@ -53,7 +53,7 @@ # include # include -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) && OSMAJORVERSION > 8 # include #else # include @@ -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 43173ba14..87e490a35 100644 --- a/cde/programs/dtlogin/fontpath.c +++ b/cde/programs/dtlogin/fontpath.c @@ -39,7 +39,7 @@ # include # include # include -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) && OSMAJORVERSION > 8 # include #else # include diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c index 0a2cd86f0..b36d2774f 100644 --- a/cde/programs/dtlogin/session.c +++ b/cde/programs/dtlogin/session.c @@ -65,7 +65,7 @@ # include # include # include -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) && OSMAJORVERSION > 8 # include #else # include