From 7701c89750e28d17fa4ac8e95f133713c27db90e Mon Sep 17 00:00:00 2001
From: jakllsch <jakllsch>
Date: Tue, 24 Nov 2009 17:46:45 +0000
Subject: Fix kttcp build on 64-bit-time_t NetBSD. Bump PKGREVISION.

---
 benchmarks/kttcp/Makefile      |  4 ++--
 benchmarks/kttcp/files/kttcp.c | 21 +++++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'benchmarks/kttcp')

diff --git a/benchmarks/kttcp/Makefile b/benchmarks/kttcp/Makefile
index b6369c3a91e..432579de30f 100644
--- a/benchmarks/kttcp/Makefile
+++ b/benchmarks/kttcp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2009/04/09 00:48:07 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/11/24 17:46:45 jakllsch Exp $
 
 DISTNAME=	kttcp-20020711
 CATEGORIES=	benchmarks net
-PKGREVISION=	1
+PKGREVISION=	2
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
diff --git a/benchmarks/kttcp/files/kttcp.c b/benchmarks/kttcp/files/kttcp.c
index ccc50dd1d12..bd27f69db36 100644
--- a/benchmarks/kttcp/files/kttcp.c
+++ b/benchmarks/kttcp/files/kttcp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kttcp.c,v 1.6 2007/08/30 09:23:31 rillig Exp $	*/
+/*	$NetBSD: kttcp.c,v 1.7 2009/11/24 17:46:45 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -265,15 +265,18 @@ main(int argc, char *argv[])
 
 	bytespersec = kio.kio_bytesdone * 1000000LL / usecs;
 	bitspersec = bytespersec * NBBY;
-	printf("kttcp: %llu bytes in %ld.%03ld real seconds ==> %llu bytes/sec\n",
-	    kio.kio_bytesdone, kio.kio_elapsed.tv_sec,
-	    kio.kio_elapsed.tv_usec / 1000, bytespersec);
+	printf("kttcp: %llu bytes in %jd.%03jd real seconds "
+	    "==> %llu bytes/sec\n", kio.kio_bytesdone,
+	    (intmax_t)kio.kio_elapsed.tv_sec,
+	    (intmax_t)kio.kio_elapsed.tv_usec / 1000, bytespersec);
 	if (verbose > 1) {
 		timersub(&ruend.ru_stime, &rustart.ru_stime, &tvtmp);
 		bytespersec = kio.kio_bytesdone * 1000000LL /
 		    (tvtmp.tv_sec * 1000000ULL + tvtmp.tv_usec);
-		printf("kttcp: %llu bytes in %ld.%03ld CPU seconds ==> %llu bytes/CPU sec\n",
-		    kio.kio_bytesdone, tvtmp.tv_sec, tvtmp.tv_usec / 1000, bytespersec);
+		printf("kttcp: %llu bytes in %jd.%03jd CPU seconds "
+		    "==> %llu bytes/CPU sec\n", kio.kio_bytesdone,
+		    (intmax_t)tvtmp.tv_sec,
+		    (intmax_t)tvtmp.tv_usec / 1000, bytespersec);
 	}
 	printf("       %g (%g) Megabits/sec\n",
 	    ((double) bitspersec / 1024.0) / 1024.0,
@@ -285,11 +288,13 @@ main(int argc, char *argv[])
 	 */
 	if (tvtmp.tv_sec < 0)
 		tvtmp.tv_sec = tvtmp.tv_usec = 0;
-	printf("  %ld.%02lduser", tvtmp.tv_sec, tvtmp.tv_usec / 10000);
+	printf("  %jd.%02jduser", (intmax_t)tvtmp.tv_sec,
+	    (intmax_t)tvtmp.tv_usec / 10000);
 	ull = tvtmp.tv_sec * 1000000ULL + tvtmp.tv_usec;
 
 	timersub(&ruend.ru_stime, &rustart.ru_stime, &tvtmp);
-	printf(" %ld.%02ldsys", tvtmp.tv_sec, tvtmp.tv_usec / 10000);
+	printf(" %jd.%02jdsys", (intmax_t)tvtmp.tv_sec,
+	    (intmax_t)tvtmp.tv_usec / 10000);
 	ull += tvtmp.tv_sec * 1000000ULL + tvtmp.tv_usec;
 
 	printf(" %lld.%lldreal", usecs / 1000000, (usecs % 1000000) / 10000);
-- 
cgit v1.2.3