* Removed all Id tags.

[cacao.git] / src / native / native.h

diff --git a/src/native/native.h b/src/native/native.h
index 62dc3ba209de48ab9fd8ac1e49e8d66998ebac66..ee0403283c7a7a7e42e985590d6241005f7ee3bf 100644 (file)
--- a/src/native/native.h
+++ b/src/native/native.h
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: native.h 8132 2007-06-22 11:15:47Z twisti $
-
 */
 
 
@@ -32,7 +30,7 @@
 
 #include "config.h"
 
-#if !defined(WITH_STATIC_CLASSPATH)
+#if defined(ENABLE_LTDL) && defined(HAVE_LTDL_H)
 # include <ltdl.h>
 #endif
 
@@ -54,13 +52,10 @@
 
 /* table for locating native methods */
 
+#if defined(WITH_STATIC_CLASSPATH)
 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;
+#endif
 
 
 /* native_methods_node_t ******************************************************/
@@ -77,15 +72,21 @@ struct 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 {
-       java_objectheader              *loader;  /* 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        */
@@ -127,21 +128,21 @@ functionptr native_findfunction(utf *cname, utf *mname, utf *desc,
 
 #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_handle_t *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_string(classinfo *c, java_handle_t *s);
 
 #endif /* _NATIVE_H */