equal
deleted
inserted
replaced
603 // First make sure native library is loaded |
603 // First make sure native library is loaded |
604 os::native_java_library(); |
604 os::native_java_library(); |
605 // Load zip library |
605 // Load zip library |
606 char path[JVM_MAXPATHLEN]; |
606 char path[JVM_MAXPATHLEN]; |
607 char ebuf[1024]; |
607 char ebuf[1024]; |
608 os::dll_build_name(path, sizeof(path), Arguments::get_dll_dir(), "zip"); |
608 void* handle = NULL; |
609 void* handle = os::dll_load(path, ebuf, sizeof ebuf); |
609 if (os::dll_build_name(path, sizeof(path), Arguments::get_dll_dir(), "zip")) { |
|
610 handle = os::dll_load(path, ebuf, sizeof ebuf); |
|
611 } |
610 if (handle == NULL) { |
612 if (handle == NULL) { |
611 vm_exit_during_initialization("Unable to load ZIP library", path); |
613 vm_exit_during_initialization("Unable to load ZIP library", path); |
612 } |
614 } |
613 // Lookup zip entry points |
615 // Lookup zip entry points |
614 ZipOpen = CAST_TO_FN_PTR(ZipOpen_t, os::dll_lookup(handle, "ZIP_Open")); |
616 ZipOpen = CAST_TO_FN_PTR(ZipOpen_t, os::dll_lookup(handle, "ZIP_Open")); |