Date: Thu, 2 Jul 2015 22:36:31 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391202 - head/sysutils/screen/files Message-ID: <201507022236.t62MaVvc039245@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Thu Jul 2 22:36:30 2015 New Revision: 391202 URL: https://svnweb.freebsd.org/changeset/ports/391202 Log: Fix build under stable/8. PR: PR/201279 Modified: head/sysutils/screen/files/patch-utmp.c Modified: head/sysutils/screen/files/patch-utmp.c ============================================================================== --- head/sysutils/screen/files/patch-utmp.c Thu Jul 2 22:22:56 2015 (r391201) +++ head/sysutils/screen/files/patch-utmp.c Thu Jul 2 22:36:30 2015 (r391202) @@ -1,6 +1,14 @@ ---- utmp.c.orig 2014-04-26 09:22:09.000000000 -0700 -+++ utmp.c 2014-04-29 19:42:22.660642853 -0700 -@@ -409,12 +409,6 @@ +--- utmp.c.orig 2015-06-28 14:37:40.000000000 -0700 ++++ utmp.c 2015-07-02 13:22:34.463948044 -0700 +@@ -26,6 +26,7 @@ + **************************************************************** + */ + ++#include <sys/param.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +@@ -409,12 +410,6 @@ register slot_t slot; struct utmp u; int saved_ut; @@ -13,7 +21,7 @@ wi->w_slot = (slot_t)0; if (!utmpok || wi->w_type != W_TYPE_PTY) -@@ -435,51 +429,12 @@ +@@ -435,51 +430,12 @@ makeuser(&u, stripdev(wi->w_tty), LoginName, wi->w_pid); #ifdef UTHOST @@ -67,7 +75,7 @@ { Msg(errno,"Could not write %s", UtmpName); UT_CLOSE; -@@ -598,7 +553,7 @@ +@@ -598,7 +554,7 @@ struct utmp *u; { u->ut_type = DEAD_PROCESS; @@ -76,3 +84,27 @@ u->ut_exit.e_termination = 0; u->ut_exit.e_exit = 0; #endif +@@ -631,7 +587,11 @@ + /* must use temp variable because of NetBSD/sparc64, where + * ut_xtime is long(64) but time_t is int(32) */ + (void)time(&now); ++#if defined(__FreeBSD_version) && __FreeBSD_version < 900000 ++ u->ut_time = now; ++#else + u->ut_tv.tv_sec = now; ++#endif + } + + static slot_t +@@ -743,7 +703,11 @@ + strncpy(u->ut_line, line, sizeof(u->ut_line)); + strncpy(u->ut_name, user, sizeof(u->ut_name)); + (void)time(&now); ++#if defined(__FreeBSD_version) && __FreeBSD_version < 900000 ++ u->ut_time = now; ++#else + u->ut_tv.tv_sec = now; ++#endif + } + + static slot_t
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507022236.t62MaVvc039245>