svn commit: r330421 - head/java/openjdk6/files

[Jung-uk Kim]

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;