bool native_init(void)
{
+ TRACESUBSYSTEMINITIALIZATION("native_init");
+
#if defined(ENABLE_LTDL)
/* initialize libltdl */
/* fill the temporary structure used for searching the tree */
- tmpnmn.classname = m->class->name;
+ tmpnmn.classname = m->clazz->name;
tmpnmn.name = m->name;
tmpnmn.descriptor = m->descriptor;
utf *newname;
functionptr f;
#if defined(ENABLE_LTDL)
- classloader *cl;
+ classloader_t *cl;
hashtable_library_loader_entry *le;
hashtable_library_name_entry *ne;
u4 key; /* hashkey */
u4 slot; /* slot in hashtable */
#endif
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
methodinfo *method_findNative;
java_handle_t *s;
#endif
if (opt_verbosejni) {
printf("[Dynamic-linking native method ");
- utf_display_printable_ascii_classname(m->class->name);
+ utf_display_printable_ascii_classname(m->clazz->name);
printf(".");
utf_display_printable_ascii(m->name);
printf(" ... ");
/* generate method symbol string */
- name = native_method_symbol(m->class->name, m->name);
+ name = native_method_symbol(m->clazz->name, m->name);
/* generate overloaded function (having the types in it's name) */
#if defined(ENABLE_LTDL)
/* Get the classloader. */
- cl = class_get_classloader(m->class);
+ cl = class_get_classloader(m->clazz);
/* normally addresses are aligned to 4, 8 or 16 bytes */
le = le->hashlink;
}
-# if defined(WITH_CLASSPATH_SUN)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
if (f == NULL) {
/* We can resolve the function directly from
java.lang.ClassLoader as it's a static function. */
*******************************************************************************/
#if defined(ENABLE_LTDL)
-void native_library_add(utf *filename, classloader *loader, lt_dlhandle handle)
+void native_library_add(utf *filename, classloader_t *loader, lt_dlhandle handle)
{
hashtable_library_loader_entry *le;
hashtable_library_name_entry *ne; /* library name */
#if defined(ENABLE_LTDL)
hashtable_library_name_entry *native_library_find(utf *filename,
- classloader *loader)
+ classloader_t *loader)
{
hashtable_library_loader_entry *le;
hashtable_library_name_entry *ne; /* library name */
*******************************************************************************/
-int native_library_load(JNIEnv *env, utf *name, classloader *cl)
+int native_library_load(JNIEnv *env, utf *name, classloader_t *cl)
{
#if defined(ENABLE_LTDL)
lt_dlhandle handle;