From 8982638840ef0a29ad7c91f48486e3116c090a0c Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 30 May 2007 21:36:23 +0000
Subject: Fix more sysctl(3) argument sizes and correct a comment.
Approved by: glewis (implicit)
---
java/jdk15/files/patch-j2se::bin::java_md.c | 36 +++++++++++++++++++++++++----
1 file changed, 31 insertions(+), 5 deletions(-)
(limited to 'java/jdk15')
diff --git a/java/jdk15/files/patch-j2se::bin::java_md.c b/java/jdk15/files/patch-j2se::bin::java_md.c
index 44bcce094433..3b8c8a276cfe 100644
--- a/java/jdk15/files/patch-j2se::bin::java_md.c
+++ b/java/jdk15/files/patch-j2se::bin::java_md.c
@@ -1,16 +1,42 @@
---- ../../j2se/src/solaris/bin/java_md.c.orig Thu May 24 19:15:46 2007
-+++ ../../j2se/src/solaris/bin/java_md.c Thu May 24 19:14:59 2007
-@@ -1061,7 +1061,8 @@
+--- ../../j2se/src/solaris/bin/java_md.c.orig Fri May 25 21:49:14 2007
++++ ../../j2se/src/solaris/bin/java_md.c Wed May 30 17:00:23 2007
+@@ -1060,8 +1060,9 @@
+
#if defined(_ALLBSD_SOURCE)
- uint64_t result;
+- uint64_t result;
- int mib[2], rlen;
++ unsigned long result;
+ int mib[2];
+ size_t rlen;
/* fetch sysctl(hw.physmem) value */
mib[0] = CTL_HW;
-@@ -1635,7 +1636,7 @@
+@@ -1342,10 +1343,11 @@
+
+ #if defined(_ALLBSD_SOURCE)
+
+- unsigned long result, sys_processors;
+- int mib[2], rlen;
++ unsigned long sys_processors;
++ int mib[2], result;
++ size_t rlen;
+
+- /* fetch sysctl(hw.physmem) value */
++ /* fetch sysctl(hw.ncpu) value */
+ mib[0] = CTL_HW;
+ mib[1] = HW_NCPU;
+ rlen = sizeof(result);
+@@ -1354,7 +1356,7 @@
+ result = 1;
+
+ if (_launcher_debug) {
+- printf("sysctl(hw.ncpu): %lu\n", result);
++ printf("sysctl(hw.ncpu): %d\n", result);
+ }
+
+ sys_processors = result;
+@@ -1635,7 +1637,7 @@
while (dp != NULL) {
cp = strchr(dp, (int)':');
if (cp != NULL)
--
cgit v1.2.3