diff options
| -rw-r--r-- | make/build.xml | 2 | ||||
| -rw-r--r-- | src/java/com/jogamp/common/os/Platform.java | 2 | ||||
| -rw-r--r-- | src/java/jogamp/common/jvm/JVMUtil.java (renamed from src/java/com/jogamp/common/jvm/JVMUtil.java) | 6 | ||||
| -rw-r--r-- | src/native/common/JVMUtil.c (renamed from src/native/common/JVM_Tool.c) | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/make/build.xml b/make/build.xml index 99290de..a4aedbe 100644 --- a/make/build.xml +++ b/make/build.xml @@ -414,7 +414,7 @@ <fail message="Requires '${linker.cfg.id}'" unless="linker.cfg.id"/> <javah destdir="${src.generated.c}" classpath="${classes}" class="jogamp.common.os.MachineDescriptionRuntime" /> - <javah destdir="${src.generated.c}" classpath="${classes}" class="com.jogamp.common.jvm.JVMUtil" /> + <javah destdir="${src.generated.c}" classpath="${classes}" class="jogamp.common.jvm.JVMUtil" /> <javah destdir="${src.generated.c}" classpath="${classes}" class="com.jogamp.common.nio.PointerBuffer" /> <javah destdir="${src.generated.c}/Unix" classpath="${classes}" class="jogamp.common.os.UnixDynamicLinkerImpl" /> <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="jogamp.common.os.MacOSXDynamicLinkerImpl" /> diff --git a/src/java/com/jogamp/common/os/Platform.java b/src/java/com/jogamp/common/os/Platform.java index 38635e1..3d255ba 100644 --- a/src/java/com/jogamp/common/os/Platform.java +++ b/src/java/com/jogamp/common/os/Platform.java @@ -41,6 +41,7 @@ import com.jogamp.common.nio.Buffers; import com.jogamp.common.util.JarUtil; import com.jogamp.common.util.cache.TempJarCache; +import jogamp.common.jvm.JVMUtil; import jogamp.common.os.MachineDescriptionRuntime; /** @@ -190,6 +191,7 @@ public class Platform { os_and_arch = getOSAndArch(OS_TYPE, CPU_ARCH); loadGlueGenRTImpl(); + JVMUtil.initSingleton(); MachineDescription md = MachineDescriptionRuntime.getRuntime(); if(null == md) { diff --git a/src/java/com/jogamp/common/jvm/JVMUtil.java b/src/java/jogamp/common/jvm/JVMUtil.java index 29c5f57..ac6355f 100644 --- a/src/java/com/jogamp/common/jvm/JVMUtil.java +++ b/src/java/jogamp/common/jvm/JVMUtil.java @@ -30,13 +30,15 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.common.jvm; +package jogamp.common.jvm; import java.nio.ByteBuffer; + +import jogamp.common.Debug; + import com.jogamp.common.nio.Buffers; import com.jogamp.common.os.Platform; -import jogamp.common.Debug; /** * Currently this tool works around the Hotspot race condition bugs: diff --git a/src/native/common/JVM_Tool.c b/src/native/common/JVMUtil.c index 043ad8b..28ef209 100644 --- a/src/native/common/JVM_Tool.c +++ b/src/native/common/JVMUtil.c @@ -40,10 +40,10 @@ #include <stdio.h> //required by android to identify NULL #include <jni.h> -#include "com_jogamp_common_jvm_JVMUtil.h" +#include "jogamp_common_jvm_JVMUtil.h" JNIEXPORT jboolean JNICALL -Java_com_jogamp_common_jvm_JVMUtil_initialize(JNIEnv *env, jclass _unused, jobject nioBuffer) { +Java_jogamp_common_jvm_JVMUtil_initialize(JNIEnv *env, jclass _unused, jobject nioBuffer) { void * ptr = NULL; if (nioBuffer != NULL) { ptr = (void *) (*env)->GetDirectBufferAddress(env, nioBuffer); |