Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: native.h 8137 2007-06-22 16:41:36Z michi $
-
*/
#include "config.h"
-#if !defined(WITH_STATIC_CLASSPATH)
+#if defined(ENABLE_LTDL) && defined(HAVE_LTDL_H)
# include <ltdl.h>
#endif
#define NATIVE_METHODS_COUNT sizeof(methods) / sizeof(JNINativeMethod)
-/* table for locating native methods */
-
-typedef struct nativeref nativeref;
-typedef struct nativecompref nativecompref;
-
-
-#if !defined(WITH_STATIC_CLASSPATH)
-typedef struct hashtable_library_loader_entry hashtable_library_loader_entry;
-typedef struct hashtable_library_name_entry hashtable_library_name_entry;
-
-
/* native_methods_node_t ******************************************************/
typedef struct native_methods_node_t native_methods_node_t;
/* hashtable_library_loader_entry *********************************************/
+#if defined(ENABLE_LTDL)
+typedef struct hashtable_library_loader_entry hashtable_library_loader_entry;
+typedef struct hashtable_library_name_entry hashtable_library_name_entry;
+
struct hashtable_library_loader_entry {
- hashtable_classloader_entry *cle; /* class loader */
+ classloader *loader; /* class loader */
hashtable_library_name_entry *namelink;/* libs loaded by this loader */
hashtable_library_loader_entry *hashlink;/* link for external chaining */
};
+#endif
/* hashtable_library_name_entry ***********************************************/
+#if defined(ENABLE_LTDL)
struct hashtable_library_name_entry {
utf *name; /* library name */
lt_dlhandle handle; /* libtool library handle */
#endif
-struct nativeref {
- char *classname;
- char *methodname;
- char *descriptor;
- bool isstatic;
- functionptr func;
-};
-
-/* table for fast string comparison */
-
-struct nativecompref {
- utf *classname;
- utf *methodname;
- utf *descriptor;
- bool isstatic;
- functionptr func;
-};
-
-
/* function prototypes ********************************************************/
bool native_init(void);
void native_method_register(utf *classname, const JNINativeMethod *methods,
int32_t count);
-#if defined(WITH_STATIC_CLASSPATH)
-
-functionptr native_findfunction(utf *cname, utf *mname, utf *desc,
- bool isstatic);
-
-#else /* defined(WITH_STATIC_CLASSPATH) */
-
+#if defined(ENABLE_LTDL)
lt_dlhandle native_library_open(utf *filename);
-void native_library_add(utf *filename, java_objectheader *loader,
+void native_library_add(utf *filename, classloader *loader,
lt_dlhandle handle);
-
hashtable_library_name_entry *native_library_find(utf *filename,
- java_objectheader *loader);
+ classloader *loader);
+#endif
functionptr native_resolve_function(methodinfo *m);
-#endif /* defined(WITH_STATIC_CLASSPATH) */
-
-java_objectheader *native_new_and_init(classinfo *c);
-
-java_objectheader *native_new_and_init_string(classinfo *c,
- java_objectheader *s);
+java_handle_t *native_new_and_init(classinfo *c);
+java_handle_t *native_new_and_init_string(classinfo *c, java_handle_t *s);
#endif /* _NATIVE_H */
* c-basic-offset: 4
* tab-width: 4
* End:
+ * vim:noexpandtab:sw=4:ts=4:
*/