equal
deleted
inserted
replaced
1064 os::native_java_library(); |
1064 os::native_java_library(); |
1065 // Load zip library |
1065 // Load zip library |
1066 char path[JVM_MAXPATHLEN]; |
1066 char path[JVM_MAXPATHLEN]; |
1067 char ebuf[1024]; |
1067 char ebuf[1024]; |
1068 void* handle = NULL; |
1068 void* handle = NULL; |
1069 if (os::dll_build_name(path, sizeof(path), Arguments::get_dll_dir(), "zip")) { |
1069 if (os::dll_locate_lib(path, sizeof(path), Arguments::get_dll_dir(), "zip")) { |
1070 handle = os::dll_load(path, ebuf, sizeof ebuf); |
1070 handle = os::dll_load(path, ebuf, sizeof ebuf); |
1071 } |
1071 } |
1072 if (handle == NULL) { |
1072 if (handle == NULL) { |
1073 vm_exit_during_initialization("Unable to load ZIP library", path); |
1073 vm_exit_during_initialization("Unable to load ZIP library", path); |
1074 } |
1074 } |
1102 os::native_java_library(); |
1102 os::native_java_library(); |
1103 // Load jimage library |
1103 // Load jimage library |
1104 char path[JVM_MAXPATHLEN]; |
1104 char path[JVM_MAXPATHLEN]; |
1105 char ebuf[1024]; |
1105 char ebuf[1024]; |
1106 void* handle = NULL; |
1106 void* handle = NULL; |
1107 if (os::dll_build_name(path, sizeof(path), Arguments::get_dll_dir(), "jimage")) { |
1107 if (os::dll_locate_lib(path, sizeof(path), Arguments::get_dll_dir(), "jimage")) { |
1108 handle = os::dll_load(path, ebuf, sizeof ebuf); |
1108 handle = os::dll_load(path, ebuf, sizeof ebuf); |
1109 } |
1109 } |
1110 if (handle == NULL) { |
1110 if (handle == NULL) { |
1111 vm_exit_during_initialization("Unable to load jimage library", path); |
1111 vm_exit_during_initialization("Unable to load jimage library", path); |
1112 } |
1112 } |