diff options
| author | jkim <jkim@FreeBSD.org> | 2013-10-10 06:24:17 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2013-10-10 06:24:17 +0800 |
| commit | 77e77ae25e3ab3f8b665bd2843acd69716e24d32 (patch) | |
| tree | 8036af77be27bf1db55285a5a942e889e30a5f59 | |
| parent | 9e748d27c30fb5bc14f9c6596c2d897d64022167 (diff) | |
| download | freebsd-ports-gnome-77e77ae25e3ab3f8b665bd2843acd69716e24d32.tar.gz freebsd-ports-gnome-77e77ae25e3ab3f8b665bd2843acd69716e24d32.tar.zst freebsd-ports-gnome-77e77ae25e3ab3f8b665bd2843acd69716e24d32.zip | |
Add couple of compiler warning fixes. No functional change.
| -rw-r--r-- | java/openjdk6/files/patch-set | 13 |
1 files changed, 12 insertions, 1 deletions
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); |