diff options
| author | Andrew Niefer | 2008-05-09 18:38:41 +0000 |
|---|---|---|
| committer | Andrew Niefer | 2008-05-09 18:38:41 +0000 |
| commit | 55a3f945a9c7e0d833077809decd80f847d18b34 (patch) | |
| tree | 46add1cb86d95d7f806622051c5728161619a958 /bundles/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp | |
| parent | a1a45001f0fb860fe1f2a914c30c83e7ef8b1261 (diff) | |
| download | rt.equinox.framework-55a3f945a9c7e0d833077809decd80f847d18b34.tar.gz rt.equinox.framework-55a3f945a9c7e0d833077809decd80f847d18b34.tar.xz rt.equinox.framework-55a3f945a9c7e0d833077809decd80f847d18b34.zip | |
bug 195897 - identify sun vms on linux with java -version
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp')
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp b/bundles/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp index 6dfee896d..2dc940d13 100644 --- a/bundles/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp +++ b/bundles/org.eclipse.equinox.executable/library/wpf/eclipseWpf.cpp @@ -510,7 +510,8 @@ int startJavaVM( _TCHAR* libPath, _TCHAR* vmArgs[], _TCHAR* progArgs[], _TCHAR* return startJavaJNI(libPath, vmArgs, progArgs, jarFile); } -int isSunVM( _TCHAR * vm ) { +int isSunVM( _TCHAR * javaVM, _TCHAR * jniLib ) { + _TCHAR *vm = (jniLib != NULL) ? jniLib : javaVM; int result = 0; DWORD infoSize; DWORD handle; |