diff options
| author | Sven Gothel <sgothel@jausoft.com> | 2023-07-05 10:04:16 +0200 |
|---|---|---|
| committer | Sven Gothel <sgothel@jausoft.com> | 2023-07-05 10:04:16 +0200 |
| commit | ae4c2c3e59ed92caa6f0e18360b7236e50899bf6 (patch) | |
| tree | 4f19c0991b4dd54debb36a5c1c57f71bca848575 /src/java/com/jogamp/gluegen/JavaEmitter.java | |
| parent | 0c4067379e5e12617b9a4530e607ca34762b54e3 (diff) | |
GlueGen JavaCallback/LibraryOnLoad: Always include the `libraryBasename` agnostic 'emitJNIEnvDecl()' (declaration) in JNI code; Detach the thread from the JVM if newly attach in callback!
Diffstat (limited to 'src/java/com/jogamp/gluegen/JavaEmitter.java')
| -rw-r--r-- | src/java/com/jogamp/gluegen/JavaEmitter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/java/com/jogamp/gluegen/JavaEmitter.java b/src/java/com/jogamp/gluegen/JavaEmitter.java index 4a81a01..96202bf 100644 --- a/src/java/com/jogamp/gluegen/JavaEmitter.java +++ b/src/java/com/jogamp/gluegen/JavaEmitter.java @@ -910,7 +910,7 @@ public class JavaEmitter implements GlueEmitter { final String fname = nRoot + File.separator + cUnitName; jniUnit = openCUnit(fname, cUnitName); // jniUnit.emitHeader(structClassPkgName, containingJTypeName, Collections.emptyList()); - jniUnit.emitHeader(null, structClassPkgName, containingJTypeName, cfg.customCCode()); + jniUnit.emitHeader(structClassPkgName, containingJTypeName, cfg.customCCode()); } else { jniUnit = null; } @@ -3018,7 +3018,7 @@ public class JavaEmitter implements GlueEmitter { if( !cfg.getJavaCallbackList().isEmpty() && null == cfg.libraryOnLoadName() ) { LOG.log(WARNING, "JavaCallback used, but no 'LibraryOnLoad' basename specified for JNI_OnLoad(..). Exactly one native code-unit for the library must specify 'LibraryOnLoad' basename"); } - cUnit().emitHeader(cfg.libraryOnLoadName(), getImplPackageName(), cfg.implClassName(), cfg.customCCode()); + cUnit().emitHeader(getImplPackageName(), cfg.implClassName(), cfg.customCCode()); } } catch (final Exception e) { throw new RuntimeException( |