diff options
author | Arun Thondapu | 2017-04-28 20:58:44 +0000 |
---|---|---|
committer | Arun Thondapu | 2017-04-28 20:58:44 +0000 |
commit | 28ff351cfc1b33eb84c70b295e8a86bf8b70d21f (patch) | |
tree | 662e0471b0d90fa54ddf0b1935460a58abde3af9 /features | |
parent | 2e0869c0e8cf5f4125a3237f22ed6f166a065fbb (diff) | |
download | rt.equinox.framework-28ff351cfc1b33eb84c70b295e8a86bf8b70d21f.tar.gz rt.equinox.framework-28ff351cfc1b33eb84c70b295e8a86bf8b70d21f.tar.xz rt.equinox.framework-28ff351cfc1b33eb84c70b295e8a86bf8b70d21f.zip |
Bug 493761: Platform won't launch on Java 9-ea builds
(InjectionException: NoClassDefFoundError:
javax/annotation/PostConstruct)
Fix Windows build failure by declaring variables at the beginning of the
block (Windows build seems to be using an old version of VS compiler not
compliant with C99)
Change-Id: If19501943ee90e959fcc71fc8dc32b9a3a906124
Signed-off-by: Arun Thondapu <arunkumar.thondapu@in.ibm.com>
Diffstat (limited to 'features')
-rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/eclipse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipse.c b/features/org.eclipse.equinox.executable.feature/library/eclipse.c index 27e2e2faa..d65cfb2fc 100644 --- a/features/org.eclipse.equinox.executable.feature/library/eclipse.c +++ b/features/org.eclipse.equinox.executable.feature/library/eclipse.c @@ -1042,7 +1042,7 @@ static void adjustVMArgs(_TCHAR *javaVM, _TCHAR *jniLib, _TCHAR **vmArgv[]) { if (!isModularVM(javaVM, jniLib)) { while ((*vmArgv)[i] != NULL) { if (_tcsncmp((*vmArgv)[i], ADDMODULES, _tcslen(ADDMODULES)) == 0) { - int j = 0; + int j = 0, k = 0; if ((_tcschr((*vmArgv)[i], '=') != NULL) && ((*vmArgv)[i][13] == '=')) { /* --add-modules=<value> */ @@ -1057,7 +1057,7 @@ static void adjustVMArgs(_TCHAR *javaVM, _TCHAR *jniLib, _TCHAR **vmArgv[]) { } /* shift all remaining arguments, but keep i, so that we can find repeated occurrences of --add-modules */ - int k = i; + k = i; (*vmArgv)[k] = (*vmArgv)[j]; while ((*vmArgv)[j] != NULL) { (*vmArgv)[++k] = (*vmArgv)[++j]; |