debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed building on FreeBSD 8.x

Browse Source
This commit is contained in:
Karsten Pedersen
2013-02-26 19:12:35 +00:00
committed by Jon Trulson
parent cc076d7756
commit 69997241c5
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c
View File

@@ -61,7 +61,9 @@ static char rcs_id[] = "$TOG: TermPrimSetUtmp.c /main/10 1998/04/03 17:11:42 mgr
#endif /* sun */ #endif /* sun */
#ifdef __FreeBSD__ #ifdef __FreeBSD__
#if OSMAJORVERSION > 8
#define UT_UTMPX #define UT_UTMPX
#endif
#define UT_HOST ut_host #define UT_HOST ut_host
#define UT_NO_pututline #define UT_NO_pututline
#endif #endif

2
cde/programs/dtlogin/account.c
View File

@@ -57,7 +57,7 @@
#endif #endif
#include <fcntl.h> #include <fcntl.h>
#if defined(__FreeBSD__) #if defined(__FreeBSD__) && OSMAJORVERSION > 8
#include <utmpx.h> #include <utmpx.h>
#else #else
#include <utmp.h> #include <utmp.h>

6
cde/programs/dtlogin/dm.c
View File

@@ -53,7 +53,7 @@
# include <sys/signal.h> # include <sys/signal.h>
# include <sys/stat.h> # include <sys/stat.h>
#if defined(__FreeBSD__) #if defined(__FreeBSD__) && OSMAJORVERSION > 8
# include <utmpx.h> # include <utmpx.h>
#else #else
# include <utmp.h> # include <utmp.h>
@@ -1697,7 +1697,7 @@ GettyMessage( struct display *d, int msgnum )
int int
GettyRunning( struct display *d ) GettyRunning( struct display *d )
{ {
#if defined(__FreeBSD__) #if defined(__FreeBSD__) && OSMAJORVERSION > 8
struct utmpx utmp; /* local struct for new entry */ struct utmpx utmp; /* local struct for new entry */
struct utmpx *u; /* pointer to entry in utmp file */ struct utmpx *u; /* pointer to entry in utmp file */
#else #else
@@ -1722,7 +1722,7 @@ GettyRunning( struct display *d )
return FALSE; return FALSE;
#if defined(__FreeBSD__) #if defined(__FreeBSD__) && OSMAJORVERSION > 8
bzero(&utmp, sizeof(struct utmpx)); bzero(&utmp, sizeof(struct utmpx));
#else #else
bzero(&utmp, sizeof(struct utmp)); bzero(&utmp, sizeof(struct utmp));

2
cde/programs/dtlogin/fontpath.c
View File

@@ -39,7 +39,7 @@
# include <signal.h> # include <signal.h>
# include <X11/Xatom.h> # include <X11/Xatom.h>
# include <setjmp.h> # include <setjmp.h>
#if defined(__FreeBSD__) #if defined(__FreeBSD__) && OSMAJORVERSION > 8
# include <utmpx.h> # include <utmpx.h>
#else #else
# include <utmp.h> # include <utmp.h>

2
cde/programs/dtlogin/session.c
View File

@@ -65,7 +65,7 @@
# include <signal.h> # include <signal.h>
# include <X11/Xatom.h> # include <X11/Xatom.h>
# include <setjmp.h> # include <setjmp.h>
#if defined(__FreeBSD__) #if defined(__FreeBSD__) && OSMAJORVERSION > 8
# include <utmpx.h> # include <utmpx.h>
#else #else
# include <utmp.h> # include <utmp.h>