1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

Make work with -current's utmpx changes.

I tested on -current/amd64 past the utmpx change and on
8.0-RELEASE-p2/i386 for the old code path.

Reviewed: Giorgos Keramidas (maintainer)
Approved: Pav Lucistnik (for portmgr)
Feature safe: yes
This commit is contained in:
Martin Cracauer 2010-02-16 22:04:45 +00:00
parent 364c26429b
commit bfaab446bb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=249977

View File

@ -0,0 +1,34 @@
--- src/filelock.c.org 2008-01-07 23:30:11.000000000 -0500
+++ src/filelock.c 2010-02-12 17:50:08.000000000 -0500
@@ -64,7 +64,12 @@
#ifdef CLASH_DETECTION
+#if __FreeBSD_version >= 900007
+#include <utmpx.h>
+#define ut_time ut_tv.tv_sec
+#else
#include <utmp.h>
+#endif
#if !defined (S_ISLNK) && defined (S_IFLNK)
#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
@@ -253,13 +258,17 @@
the first reboot record otherwise.
Ignore all reboot records on or before BOOT_TIME.
Success is indicated by setting BOOT_TIME to a larger value. */
-
void
get_boot_time_1 (filename, newest)
char *filename;
int newest;
{
+#if __FreeBSD_version >= 900007
+ struct utmpx ut, *utp;
+#else
struct utmp ut, *utp;
+#endif
+
int desc;
if (filename)