diff options
| author | Sven Gothel <[email protected]> | 2014-07-05 15:11:37 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-07-05 15:11:37 +0200 |
| commit | 95dad44d1e825382bc5895f76c21f24bc5776501 (patch) | |
| tree | 4997a341b434e1b7b03e82e2eeb81e0316c37dea /src/java/com/jogamp/common/os | |
| parent | df9ff7f340a5ab4e07efc613f5f264eeae63d4c7 (diff) | |
| parent | dc1fee7a307ed24c1b6b02fa0936641450c24984 (diff) | |
Merge remote-tracking branch 'github-mark/master' (Bug 1023, Bug 1024)
Conflicts:
src/java/com/jogamp/common/jvm/JNILibLoaderBase.java
src/java/com/jogamp/common/os/Platform.java
src/junit/com/jogamp/common/util/TestTempJarCache.java
(re-injected that api-doc of addNativeJarLibsImpl)
Diffstat (limited to 'src/java/com/jogamp/common/os')
| -rw-r--r-- | src/java/com/jogamp/common/os/Platform.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/java/com/jogamp/common/os/Platform.java b/src/java/com/jogamp/common/os/Platform.java index 933947c..b8e3385 100644 --- a/src/java/com/jogamp/common/os/Platform.java +++ b/src/java/com/jogamp/common/os/Platform.java @@ -40,7 +40,6 @@ import com.jogamp.common.util.ReflectionUtil; import com.jogamp.common.util.VersionNumber; import com.jogamp.common.util.cache.TempJarCache; -import jogamp.common.Debug; import jogamp.common.jvm.JVMUtil; import jogamp.common.os.MachineDescriptionRuntime; import jogamp.common.os.PlatformPropsImpl; @@ -201,7 +200,7 @@ public class Platform extends PlatformPropsImpl { // load GluegenRT native library if(_USE_TEMP_JAR_CACHE[0] && TempJarCache.initSingleton()) { try { - JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { Platform.class }, null, null ); + JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { Platform.class }, null); } catch (final Exception e0) { // IllegalArgumentException, IOException System.err.println("Caught "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while JNILibLoaderBase.addNativeJarLibs(..)"); |