From 147d3f7524b475be5b8cd139be8d067eb4b8a3a6 Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 9 Oct 2013 22:24:17 +0000
Subject: Add couple of compiler warning fixes.  No functional change.

---
 java/openjdk6/files/patch-set | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'java/openjdk6')

diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set
index 6b6f7f744d96..ee6e5228757e 100644
--- a/java/openjdk6/files/patch-set
+++ b/java/openjdk6/files/patch-set
@@ -590,6 +590,17 @@
   HOSTCXX = $(CXX)
   HOSTCC  = $(CC)
  endif
+--- hotspot/src/os/bsd/vm/osThread_bsd.cpp
++++ hotspot/src/os/bsd/vm/osThread_bsd.cpp
+@@ -49,7 +49,7 @@
+ 
+ void OSThread::pd_initialize() {
+   assert(this != NULL, "check");
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+   _thread_id        = 0;
+ #else
+   _thread_id        = NULL;
 --- hotspot/src/os/bsd/vm/osThread_bsd.hpp
 +++ hotspot/src/os/bsd/vm/osThread_bsd.hpp
 @@ -39,7 +39,7 @@
@@ -848,7 +859,7 @@
 +  cpuset_t mask;
 +  if (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(mask),
 +      &mask) == 0)
-+    for (int i = 0; i < sizeof(mask) / sizeof(long); i++)
++    for (u_int i = 0; i < sizeof(mask) / sizeof(long); i++)
 +      online_cpus += __builtin_popcountl(((long *)&mask)[i]);
 +#else
 +  online_cpus = ::sysconf(_SC_NPROCESSORS_ONLN);
-- 
cgit v1.2.3