diff -r caf58ffa0845 -r 33e9405ab91b jdk/src/windows/bin/java_md.c --- a/jdk/src/windows/bin/java_md.c Wed Jul 05 16:44:40 2017 +0200 +++ b/jdk/src/windows/bin/java_md.c Wed Jan 14 21:35:03 2009 -0800 @@ -41,7 +41,6 @@ #define JVM_DLL "jvm.dll" #define JAVA_DLL "java.dll" -#define CRT_DLL "msvcr71.dll" /* * Prototypes. @@ -206,7 +205,15 @@ * assumed to be present in the "JRE path" directory. If it is not found * there (or "JRE path" fails to resolve), skip the explicit load and let * nature take its course, which is likely to be a failure to execute. + * + * (NOTE: the above statement is only true for Visual Studio 2003 and + * msvcr71.dll.) */ +#ifdef _MSC_VER +#if _MSC_VER < 1400 +#define CRT_DLL "msvcr71.dll" +#endif +#ifdef CRT_DLL if (GetJREPath(crtpath, MAXPATHLEN)) { (void)JLI_StrCat(crtpath, "\\bin\\" CRT_DLL); /* Add crt dll */ JLI_TraceLauncher("CRT path is %s\n", crtpath); @@ -217,6 +224,8 @@ } } } +#endif /* CRT_DLL */ +#endif /* _MSC_VER */ /* Load the Java VM DLL */ if ((handle = LoadLibrary(jvmpath)) == 0) {