Fixed building on FreeBSD 8.x
This commit is contained in:
committed by
Jon Trulson
parent
cc076d7756
commit
69997241c5
@@ -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
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
#endif
|
||||
|
||||
#include <fcntl.h>
|
||||
#if defined(__FreeBSD__)
|
||||
#if defined(__FreeBSD__) && OSMAJORVERSION > 8
|
||||
#include <utmpx.h>
|
||||
#else
|
||||
#include <utmp.h>
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user