Changeset 93

Timestamp:

Aug 5, 2010, 10:58:16 PM (15 years ago)

Author:

dmik

Message:

jvm/java/main: On OS/2, add the path that contains the loaded JVM.DLL to BEGINLIBPATH so that other DLLs referring to it just as JVM (instead of the full path) could also find it.

File:

• trunk/openjdk/jdk/src/windows/bin/java_md.c (modified) (2 diffs)

trunk/openjdk/jdk/src/windows/bin/java_md.c

@@ -23 +23 @@
  * have any questions.
  */
+
+#ifdef __WIN32OS2__
+#define INCL_DOSMISC
+#include <os2wrap2.h>
+#endif
 
 #include <windows.h>
@@ -225 +230 @@
         return JNI_FALSE;
     }
+
+#if __WIN32OS2__
+    /*
+     * Make sure that other DLLs statically linked to the Java VM DLL (so that
+     * they refer to it as 'JVM' instead of the full path) are able to find it.
+     */
+    strcpy(crtpath, jvmpath);
+    char *sep = strrchr(crtpath, '\\');
+    if (sep) {
+        *sep = '\0';
+        DosSetExtLIBPATH(crtpath, BEGIN_LIBPATH);
+    }
+#endif
 
     /* Now get the function addresses */