Fix ARM build:
1. NO_FORTH needs to be defined 2. bootpd.c rev 1.24: make tv_sec a time_t 3. authpf.c rev 1.7: handle timeval.tv_sec change from long to time_t Approved by: re(BMAH)
This commit is contained in:
parent
a425fbd465
commit
6075c8df8f
@ -42,6 +42,9 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#ifdef __FreeBSD__
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
#include <login_cap.h>
|
||||
#include <pwd.h>
|
||||
#include <signal.h>
|
||||
@ -702,8 +705,13 @@ change_filter(int add, const char *luser, const char *ipsrc)
|
||||
syslog(LOG_INFO, "allowing %s, user %s", ipsrc, luser);
|
||||
} else {
|
||||
gettimeofday(&Tend, NULL);
|
||||
#ifdef __FreeBSD__
|
||||
syslog(LOG_INFO, "removed %s, user %s - duration %jd seconds",
|
||||
ipsrc, luser, (intmax_t)(Tend.tv_sec - Tstart.tv_sec));
|
||||
#else
|
||||
syslog(LOG_INFO, "removed %s, user %s - duration %ld seconds",
|
||||
ipsrc, luser, Tend.tv_sec - Tstart.tv_sec);
|
||||
#endif
|
||||
}
|
||||
return (0);
|
||||
no_mem:
|
||||
|
@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <paths.h>
|
||||
#include <syslog.h>
|
||||
#include <assert.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
#ifdef NO_SETSID
|
||||
# include <fcntl.h> /* for O_RDONLY, etc */
|
||||
@ -535,8 +536,8 @@ main(argc, argv)
|
||||
}
|
||||
if (!FD_ISSET(s, &readfds)) {
|
||||
if (debug > 1)
|
||||
report(LOG_INFO, "exiting after %ld minutes of inactivity",
|
||||
actualtimeout.tv_sec / 60);
|
||||
report(LOG_INFO, "exiting after %jd minutes of inactivity",
|
||||
(intmax_t)actualtimeout.tv_sec / 60);
|
||||
exit(0);
|
||||
}
|
||||
ra_len = sizeof(recv_addr);
|
||||
|
@ -1,5 +1,9 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.if ${MACHINE_ARCH} == "arm"
|
||||
NO_BOOT=
|
||||
.endif
|
||||
|
||||
# The boot loader
|
||||
.if !defined(NO_BOOT)
|
||||
SUBDIR= boot
|
||||
|
Loading…
x
Reference in New Issue
Block a user