From 8b4d0cce83ce6362a907a74554a83cee13c2d546 Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Tue, 8 Apr 2008 15:57:29 +0000 Subject: - Fix build on sparc64 and amd64 Approved by: maintainer (timeout), miwi (mentor) --- net/relayd/Makefile | 4 ---- net/relayd/files/patch-ctl-relayctl.c | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'net') diff --git a/net/relayd/Makefile b/net/relayd/Makefile index fc8fd525b878..d281d6b73d9c 100644 --- a/net/relayd/Makefile +++ b/net/relayd/Makefile @@ -52,10 +52,6 @@ do-install: .include -.if ${ARCH} == "amd64" -BROKEN= Does not compile -.endif - .if ${OSVERSION} < 502106 IGNORE= is of no use for you because your system is too old and doesn't have pf .endif diff --git a/net/relayd/files/patch-ctl-relayctl.c b/net/relayd/files/patch-ctl-relayctl.c index 7aa04fa8810a..478e4a7d68cc 100644 --- a/net/relayd/files/patch-ctl-relayctl.c +++ b/net/relayd/files/patch-ctl-relayctl.c @@ -1,5 +1,5 @@ ---- relayctl/relayctl.c.orig Thu Feb 22 14:59:13 2007 -+++ relayctl/relayctl.c Fri Jun 8 13:00:53 2007 +--- relayctl/relayctl.c.orig 2007-12-20 21:15:43.000000000 +0100 ++++ relayctl/relayctl.c 2008-03-20 17:15:14.000000000 +0100 @@ -20,6 +20,7 @@ */ @@ -8,7 +8,7 @@ #include #include #include -@@ -286,7 +287,7 @@ +@@ -297,7 +298,7 @@ imn = monitor_lookup(imsg->hdr.type); printf("%s: imsg type %u len %u peerid %u pid %d\n", imn->name, imsg->hdr.type, imsg->hdr.len, imsg->hdr.peerid, imsg->hdr.pid); @@ -17,3 +17,12 @@ if (imn->type == -1) done = 1; if (imn->func != NULL) +@@ -508,7 +509,7 @@ + printf("\t%8s\ttotal: %llu sessions\n" + "\t%8s\tlast: %u/%us %u/h %u/d sessions\n" + "\t%8s\taverage: %u/%us %u/h %u/d sessions\n", +- "", crs.cnt, ++ "", (long long unsigned)crs.cnt, + "", crs.last, crs.interval, + crs.last_hour, crs.last_day, + "", crs.avg, crs.interval, -- cgit