diff options
| author | Sravan Kumar Lakkimsetti | 2017-09-15 14:22:34 +0000 |
|---|---|---|
| committer | Sravan Kumar Lakkimsetti | 2017-09-15 14:22:34 +0000 |
| commit | 421d375d052c6c66a35bdcc6a60f31b615616d37 (patch) | |
| tree | daaad1adeef553e6eca7ded845fcb215a881725a /features/org.eclipse.equinox.executable.feature/library/eclipse.c | |
| parent | a9a01a28b2b40e95522ccb50e8d2249330bdb806 (diff) | |
| download | rt.equinox.framework-421d375d052c6c66a35bdcc6a60f31b615616d37.tar.gz rt.equinox.framework-421d375d052c6c66a35bdcc6a60f31b615616d37.tar.xz rt.equinox.framework-421d375d052c6c66a35bdcc6a60f31b615616d37.zip | |
Bug 520636 - Make sure Eclipse starts with Java 9
-making the changes mac specific
Change-Id: I402169a44dc28f83c8a676b2dce50848ba2fcf31
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature/library/eclipse.c')
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/eclipse.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipse.c b/features/org.eclipse.equinox.executable.feature/library/eclipse.c index 3408c786c..4ff218722 100644 --- a/features/org.eclipse.equinox.executable.feature/library/eclipse.c +++ b/features/org.eclipse.equinox.executable.feature/library/eclipse.c @@ -272,7 +272,9 @@ static int noSplash = 0; /* True: do not show splash win */ static int suppressErrors = 0; /* True: do not display errors dialogs */ int secondThread = 0; /* True: start the VM on a second thread */ static int appendVmargs = 0; /* True: append cmdline vmargs to launcher.ini vmargs */ +#ifdef MACOSX static int skipJava9ParamRemoval = 0; /* Set to true only on macOS, if -vm was present on commandline or in eclipse.ini and points to a shared lib */ +#endif static _TCHAR* showSplashArg = NULL; /* showsplash data (main launcher window) */ static _TCHAR* splashBitmap = NULL; /* the actual splash bitmap */ @@ -1042,7 +1044,11 @@ static void adjustVMArgs(_TCHAR *javaVM, _TCHAR *jniLib, _TCHAR **vmArgv[]) { int i = 0; +#ifdef MACOSX if (!skipJava9ParamRemoval && !isModularVM(javaVM, jniLib)) { +#else + if (!isModularVM(javaVM, jniLib)) { +#endif while ((*vmArgv)[i] != NULL) { if (_tcsncmp((*vmArgv)[i], ADDMODULES, _tcslen(ADDMODULES)) == 0) { int j = 0, k = 0; |