* src/native/native.c: Removed wrong comment.

* src/native/native.h [ENABLE_LTDL && HAVE_LTDL_H] (ltdl.h): Added
#ifdef.
[ENABLE_LTDL] (hashtable_library_loader_entry): Likewise.
[ENABLE_LTDL] (hashtable_library_name_entry): Likewise.
[ENABLE_LTDL] (native_library_open, native_library_add)
(native_library_find): Likewise.

diff --git a/src/native/native.c b/src/native/native.c
index d952faa8e5e9c08e619b2e05238487ca49689179..3d38089c656496b97081b850ead0cfb8ba6af17c 100644 (file)
--- a/src/native/native.c
+++ b/src/native/native.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: native.c 8164 2007-06-29 18:56:08Z twisti $
+   $Id: native.c 8166 2007-06-29 19:45:17Z twisti $
 
 */
 
@@ -630,7 +630,7 @@ void native_library_add(utf *filename, java_objectheader *loader,
 
        LOCK_MONITOR_EXIT(hashtable_library->header);
 }
-#endif /* !defined(WITH_STATIC_CLASSPATH) */
+#endif
 
 
 /* native_library_find *********************************************************

diff --git a/src/native/native.h b/src/native/native.h
index 62dc3ba209de48ab9fd8ac1e49e8d66998ebac66..f949b14fb773681d3eac15016f6a2e8d34cbcd44 100644 (file)
--- a/src/native/native.h
+++ b/src/native/native.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: native.h 8132 2007-06-22 11:15:47Z twisti $
+   $Id: native.h 8166 2007-06-29 19:45:17Z twisti $
 
 */
 
@@ -32,7 +32,7 @@
 
 #include "config.h"
 
-#if !defined(WITH_STATIC_CLASSPATH)
+#if defined(ENABLE_LTDL) && defined(HAVE_LTDL_H)
 # include <ltdl.h>
 #endif
 
@@ -54,13 +54,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 +74,22 @@ struct native_methods_node_t {
 
 /* hashtable_library_loader_entry *********************************************/
 
+#if defined(ENABLE_LTDL)
+typedef struct hashtable_library_loader_entry hashtable_library_loader_entry;
+
 struct hashtable_library_loader_entry {
        java_objectheader              *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)
+typedef struct hashtable_library_name_entry hashtable_library_name_entry;
+
 struct hashtable_library_name_entry {
        utf                          *name;      /* library name                  */
        lt_dlhandle                   handle;    /* libtool library handle        */
@@ -127,12 +131,13 @@ 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,
                                                           lt_dlhandle handle);
-
 hashtable_library_name_entry *native_library_find(utf *filename,
                                                                                                  java_objectheader *loader);
+# endif
 
 functionptr native_resolve_function(methodinfo *m);