Changeset 252 for trunk/openjdk/hotspot/src/os/windows

Timestamp:

Jan 28, 2011, 11:17:17 AM (15 years ago)

Author:

dmik

Message:

hotspot: Use LIBPATH to comprise java.library.path instead of PATH on OS/2.

File:

• trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp (modified) (2 diffs)

trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp

@@ -159 +159 @@
 LONG WINAPI Handle_FLT_Exception(struct _EXCEPTION_POINTERS* exceptionInfo);
 #endif
+
+#ifdef __WIN32OS2__
+const char *getLibPath(); // defined in os_os2.cpp
+#endif
+
 void os::init_system_properties_values() {
   /* sysclasspath, java_home, dll_dir */
@@ -216 +221 @@
     char *library_path;
     char tmp[MAX_PATH];
+
+#ifdef __WIN32OS2__
+    /* On OS/2, LIBPATH is used for DLL searching insetad of PATH */
+    const char *path_str = getLibPath();
+#else
     char *path_str = ::getenv("PATH");
+#endif
 
     library_path = NEW_C_HEAP_ARRAY(char, MAX_PATH * 5 + sizeof(PACKAGE_DIR) +