Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2006-12-07 23:23:44 +0000
committerAndrew Niefer2006-12-07 23:23:44 +0000
commit01fde3cca724d947f28aab3c63e766663ff93bb2 (patch)
tree2dc7baec2ac6e844b1b69843502f6bfcdd134dcc /bundles/org.eclipse.equinox.executable/library/eclipseJNI.c
parent25e85ed332feac7061f5427fa5d0b20052aae31b (diff)
downloadrt.equinox.framework-01fde3cca724d947f28aab3c63e766663ff93bb2.tar.gz
rt.equinox.framework-01fde3cca724d947f28aab3c63e766663ff93bb2.tar.xz
rt.equinox.framework-01fde3cca724d947f28aab3c63e766663ff93bb2.zip
MACOSX: better selection of VM, resolving symlinks and restarting the launcher
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/eclipseJNI.c')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/eclipseJNI.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/eclipseJNI.c b/bundles/org.eclipse.equinox.executable/library/eclipseJNI.c
index 283b4c21c..fd34a7605 100644
--- a/bundles/org.eclipse.equinox.executable/library/eclipseJNI.c
+++ b/bundles/org.eclipse.equinox.executable/library/eclipseJNI.c
@@ -209,7 +209,11 @@ int startJavaVM( _TCHAR* libPath, _TCHAR* vmArgs[], _TCHAR* progArgs[] )
options[i].extraInfo = 0;
}
+#ifdef MACOSX
+ init_args.version = JNI_VERSION_1_4;
+#else
init_args.version = JNI_VERSION_1_2;
+#endif
init_args.options = options;
init_args.nOptions = numVMArgs;
init_args.ignoreUnrecognized = JNI_TRUE;

Back to the top