* configure.ac (AC_CHECK_ENABLE_LTDL): Removed.

[cacao.git] / src / native / vm / gnuclasspath / java_lang_VMRuntime.c

diff --git a/src/native/vm/gnuclasspath/java_lang_VMRuntime.c b/src/native/vm/gnuclasspath/java_lang_VMRuntime.c
index 25be0db79c490256d9d1a5bd524c8e4f47f5aa52..2ab5bd0dfd5219e6b9fca0d4edcbb8f3c91a8243 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_VMRuntime.c
+++ b/src/native/vm/gnuclasspath/java_lang_VMRuntime.c
@@ -279,17 +279,11 @@ JNIEXPORT java_lang_String* JNICALL Java_java_lang_VMRuntime_mapLibraryName(JNIE
 
        /* calculate length of library name */
 
-       buffer_len = strlen("lib");
-
-       buffer_len += utf_bytes(u);
-
-#if defined(__DARWIN__)
-       buffer_len += strlen(".dylib");
-#else
-       buffer_len += strlen(".so");
-#endif
-
-       buffer_len += strlen("0");
+       buffer_len =
+               strlen(NATIVE_LIBRARY_PREFIX) +
+               utf_bytes(u) +
+               strlen(NATIVE_LIBRARY_SUFFIX) +
+               strlen("0");
 
        DMARKER;
 
@@ -297,14 +291,9 @@ JNIEXPORT java_lang_String* JNICALL Java_java_lang_VMRuntime_mapLibraryName(JNIE
 
        /* generate library name */
 
-       strcpy(buffer, "lib");
+       strcpy(buffer, NATIVE_LIBRARY_PREFIX);
        utf_cat(buffer, u);
-
-#if defined(__DARWIN__)
-       strcat(buffer, ".dylib");
-#else
-       strcat(buffer, ".so");
-#endif
+       strcat(buffer, NATIVE_LIBRARY_SUFFIX);
 
        o = javastring_new_from_utf_string(buffer);