From owner-svn-ports-all@freebsd.org Wed Jun 22 21:54:13 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37F38B72DDD; Wed, 22 Jun 2016 21:54:13 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 07FBD265E; Wed, 22 Jun 2016 21:54:12 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5MLsCic009039; Wed, 22 Jun 2016 21:54:12 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5MLsCXZ009038; Wed, 22 Jun 2016 21:54:12 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201606222154.u5MLsCXZ009038@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Wed, 22 Jun 2016 21:54:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417337 - head/benchmarks/iozone/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jun 2016 21:54:13 -0000 Author: mi Date: Wed Jun 22 21:54:12 2016 New Revision: 417337 URL: https://svnweb.freebsd.org/changeset/ports/417337 Log: Fix a problem with the new patch. It is a no-op on FreeBSD, but it prevented compillation on 32-bit Linux. This is the version the author has just incorporated into his source. Modified: head/benchmarks/iozone/files/patch-libasync.c Modified: head/benchmarks/iozone/files/patch-libasync.c ============================================================================== --- head/benchmarks/iozone/files/patch-libasync.c Wed Jun 22 21:45:48 2016 (r417336) +++ head/benchmarks/iozone/files/patch-libasync.c Wed Jun 22 21:54:12 2016 (r417337) @@ -37,13 +37,13 @@ and the like) and other warnings. +# endif #endif #if defined(OSFV5) -@@ -151,13 +164,13 @@ +@@ -151,13 +164,14 @@ * this structure type. */ -char version[] = "Libasync Version $Revision: 3.25 $"; +static const char version[] = "Libasync Version $Revision: 3.25 $"; struct cache_ent { - struct aiocb myaiocb; /* For use in small file mode */ +- struct aiocb myaiocb; /* For use in small file mode */ #ifdef _LARGEFILE64_SOURCE #if defined(__CrayX1__) - aiocb64_t myaiocb64; /* For use in large file mode */ @@ -53,6 +53,8 @@ and the like) and other warnings. -#endif + struct aiocb64 myaiocb; /* For use in large file mode */ +#endif ++#else ++ struct aiocb myaiocb; #endif long long fd; /* File descriptor */ @@ -192,6 +205,6 @@