From bbff849d70da4fbd211b15be18f43efce6c251c8 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Mon, 7 Nov 2005 13:55:32 +0000
Subject: Depend on errno.h to provide errno.

---
 benchmarks/ttcp/distinfo         |  4 ++--
 benchmarks/ttcp/patches/patch-ab | 28 ++++++++++++++++++----------
 2 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'benchmarks')

diff --git a/benchmarks/ttcp/distinfo b/benchmarks/ttcp/distinfo
index 8a361d69df6..1bec744ec56 100644
--- a/benchmarks/ttcp/distinfo
+++ b/benchmarks/ttcp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2005/02/22 21:16:37 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/11/07 13:55:32 joerg Exp $
 
 SHA1 (ttcp.tar.Z) = 33a60af208eff3dc9ae745060f44b24c4e74aa7e
 RMD160 (ttcp.tar.Z) = b5cb1a8efe0f716d25d58a4950f35bac47b17668
 Size (ttcp.tar.Z) = 18163 bytes
 SHA1 (patch-aa) = a9717aa9fd5f8cdff1a39c9b7d6ab17abbe399ad
-SHA1 (patch-ab) = 4966c7024bb18301f18a8ca2cbc821f56af3aea9
+SHA1 (patch-ab) = 402874d81ec7c76b7279d4d4e79a5b851bf95804
diff --git a/benchmarks/ttcp/patches/patch-ab b/benchmarks/ttcp/patches/patch-ab
index 119278f9291..3baa876d734 100644
--- a/benchmarks/ttcp/patches/patch-ab
+++ b/benchmarks/ttcp/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2004/07/30 10:16:52 he Exp $
+$NetBSD: patch-ab,v 1.6 2005/11/07 13:55:32 joerg Exp $
 
---- ttcp.c.orig	1997-02-27 22:30:23.000000000 +0100
+--- ttcp.c.orig	1997-02-27 21:30:23.000000000 +0000
 +++ ttcp.c
 @@ -55,6 +55,7 @@ static char RCSid[] = "ttcp.c $Revision:
  #include <arpa/inet.h>
@@ -10,7 +10,15 @@ $NetBSD: patch-ab,v 1.5 2004/07/30 10:16:52 he Exp $
  
  #if defined(SYSV)
  #include <sys/times.h>
-@@ -151,7 +152,7 @@ main(argc,argv)
+@@ -99,7 +100,6 @@ char fmt = 'K';			/* output format: k = 
+ int touchdata = 0;		/* access data after reading */
+ 
+ struct hostent *addr;
+-extern int errno;
+ extern int optind;
+ extern char *optarg;
+ 
+@@ -151,7 +151,7 @@ main(argc,argv)
  int argc;
  char **argv;
  {
@@ -19,7 +27,7 @@ $NetBSD: patch-ab,v 1.5 2004/07/30 10:16:52 he Exp $
  	int c;
  
  	if (argc < 2) goto usage;
-@@ -263,29 +264,30 @@ char **argv;
+@@ -263,29 +263,30 @@ char **argv;
  	if ( (buf = (char *)malloc(buflen+bufalign)) == (char *)NULL)
  		err("malloc");
  	if (bufalign != 0)
@@ -57,7 +65,7 @@ $NetBSD: patch-ab,v 1.5 2004/07/30 10:16:52 he Exp $
  		err("bind");
  
  #if defined(SO_SNDBUF) || defined(SO_RCVBUF)
-@@ -326,7 +328,7 @@ char **argv;
+@@ -326,7 +327,7 @@ char **argv;
  			mes("nodelay");
  		}
  #endif
@@ -66,7 +74,7 @@ $NetBSD: patch-ab,v 1.5 2004/07/30 10:16:52 he Exp $
  			err("connect");
  		mes("connect");
  	    } else {
-@@ -348,11 +350,11 @@ char **argv;
+@@ -348,11 +349,11 @@ char **argv;
  		}
  		fromlen = sizeof(frominet);
  		domain = AF_INET;
@@ -80,7 +88,7 @@ $NetBSD: patch-ab,v 1.5 2004/07/30 10:16:52 he Exp $
  				&peerlen) < 0) {
  			err("getpeername");
  		  }
-@@ -412,25 +414,25 @@ char **argv;
+@@ -412,25 +413,25 @@ char **argv;
  	}
  	if( cput <= 0.0 )  cput = 0.001;
  	if( realt <= 0.0 )  realt = 0.001;
@@ -111,7 +119,7 @@ $NetBSD: patch-ab,v 1.5 2004/07/30 10:16:52 he Exp $
  		"ttcp%s: buffer address %#x\n",
  		trans?"-t":"-r",
  		buf);
-@@ -752,7 +754,7 @@ int count;
+@@ -752,7 +753,7 @@ int count;
  	int len = sizeof(from);
  	register int cnt;
  	if( udp )  {
@@ -120,7 +128,7 @@ $NetBSD: patch-ab,v 1.5 2004/07/30 10:16:52 he Exp $
  		numCalls++;
  	} else {
  		if( b_flag )
-@@ -782,7 +784,7 @@ int count;
+@@ -782,7 +783,7 @@ int count;
  	register int cnt;
  	if( udp )  {
  again:
@@ -129,7 +137,7 @@ $NetBSD: patch-ab,v 1.5 2004/07/30 10:16:52 he Exp $
  		numCalls++;
  		if( cnt<0 && errno == ENOBUFS )  {
  			delay(18000);
-@@ -803,7 +805,7 @@ delay(us)
+@@ -803,7 +804,7 @@ delay(us)
  
  	tv.tv_sec = 0;
  	tv.tv_usec = us;
-- 
cgit v1.2.3