From owner-svn-ports-all@FreeBSD.ORG  Tue Oct 15 18:12:06 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 03F2CFB8;
 Tue, 15 Oct 2013 18:12:06 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E5C502CEF;
 Tue, 15 Oct 2013 18:12:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FIC5UI005413;
 Tue, 15 Oct 2013 18:12:05 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FIC5Aa005412;
 Tue, 15 Oct 2013 18:12:05 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201310151812.r9FIC5Aa005412@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 15 Oct 2013 18:12:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330421 - head/java/openjdk6/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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Oct 2013 18:12:06 -0000

Author: jkim
Date: Tue Oct 15 18:12:05 2013
New Revision: 330421
URL: http://svnweb.freebsd.org/changeset/ports/330421

Log:
  Fix build on old releases where nitems() macro is not defined.
  
  Reported by:	Scott Ballantyne (sdb at ssr dot com)

Modified:
  head/java/openjdk6/files/patch-set

Modified: head/java/openjdk6/files/patch-set
==============================================================================
--- head/java/openjdk6/files/patch-set	Tue Oct 15 18:11:40 2013	(r330420)
+++ head/java/openjdk6/files/patch-set	Tue Oct 15 18:12:05 2013	(r330421)
@@ -676,7 +676,7 @@
 +  julong free_pages;
 +  u_int i, npages;
 +
-+  for (i = 0, free_pages = 0; i < nitems(vm_stats); i++) {
++  for (i = 0, free_pages = 0; i < sizeof(vm_stats) / sizeof(vm_stats[0]); i++) {
 +    size = sizeof(npages);
 +    if (sysctlbyname(vm_stats[i], &npages, &size, NULL, 0) == -1) {
 +      free_pages = 0;
@@ -816,7 +816,7 @@
 +  size_t mibsize, size;
 +  int mib[16], n, total = 0, used = 0;
 +
-+  mibsize = nitems(mib);
++  mibsize = sizeof(mib) / sizeof(mib[0]);
 +  if (sysctlnametomib("vm.swap_info", mib, &mibsize) != -1) {
 +    for (n = 0; ; n++) {
 +      mib[mibsize] = n;