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

[Jung-uk Kim]

Author: jkim
Date: Wed Oct  9 22:24:17 2013
New Revision: 329933
URL: http://svnweb.freebsd.org/changeset/ports/329933

Log:
  Add couple of compiler warning fixes.  No functional change.

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

Modified: head/java/openjdk6/files/patch-set
==============================================================================
--- head/java/openjdk6/files/patch-set	Wed Oct  9 22:15:48 2013	(r329932)
+++ head/java/openjdk6/files/patch-set	Wed Oct  9 22:24:17 2013	(r329933)
@@ -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);