diff options
| author | Andrew Niefer | 2009-10-07 17:52:45 +0000 |
|---|---|---|
| committer | Andrew Niefer | 2009-10-07 17:52:45 +0000 |
| commit | 7695bdc0e7a5a0884a1fb5e70e562e6d55f8a949 (patch) | |
| tree | 469be35db069ba20f9a94c2373ee2dc8dcd0cd1a /bundles/org.eclipse.equinox.executable | |
| parent | 06fe999adc00c7c0d000efc3d61a59b6201bf84f (diff) | |
| download | rt.equinox.framework-7695bdc0e7a5a0884a1fb5e70e562e6d55f8a949.tar.gz rt.equinox.framework-7695bdc0e7a5a0884a1fb5e70e562e6d55f8a949.tar.xz rt.equinox.framework-7695bdc0e7a5a0884a1fb5e70e562e6d55f8a949.zip | |
bug 289138 - ANSI/UNICODE backwards compatibility
Diffstat (limited to 'bundles/org.eclipse.equinox.executable')
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/eclipse.c | 4 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/eclipseCommon.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/eclipse.c b/bundles/org.eclipse.equinox.executable/library/eclipse.c index 729d49c7d..d0493706a 100644 --- a/bundles/org.eclipse.equinox.executable/library/eclipse.c +++ b/bundles/org.eclipse.equinox.executable/library/eclipse.c @@ -338,7 +338,7 @@ static int isConsoleLauncher(); static int consoleLauncher = 0; /* Record the arguments that were used to start the original executable */ -JNIEXPORT void setInitialArgs(int argc, _TCHAR** argv, _TCHAR* lib) { +JNIEXPORT void setInitialArgsW(int argc, _TCHAR** argv, _TCHAR* lib) { initialArgc = argc; initialArgv = argv; library = lib; @@ -346,7 +346,7 @@ JNIEXPORT void setInitialArgs(int argc, _TCHAR** argv, _TCHAR* lib) { /* this method must match the RunMethod typedef in eclipseMain.c */ /* vmArgs must be NULL terminated */ -JNIEXPORT int run(int argc, _TCHAR* argv[], _TCHAR* vmArgs[]) +JNIEXPORT int runW(int argc, _TCHAR* argv[], _TCHAR* vmArgs[]) { _TCHAR** vmCommand = NULL; _TCHAR** vmCommandArgs = NULL; diff --git a/bundles/org.eclipse.equinox.executable/library/eclipseCommon.h b/bundles/org.eclipse.equinox.executable/library/eclipseCommon.h index e26aa062d..1cf471024 100644 --- a/bundles/org.eclipse.equinox.executable/library/eclipseCommon.h +++ b/bundles/org.eclipse.equinox.executable/library/eclipseCommon.h @@ -19,8 +19,8 @@ #define MAX_PATH_LENGTH 2000 -#define RUN_METHOD _T_ECLIPSE("run") -#define SET_INITIAL_ARGS _T_ECLIPSE("setInitialArgs") +#define RUN_METHOD _T_ECLIPSE("runW") +#define SET_INITIAL_ARGS _T_ECLIPSE("setInitialArgsW") #define DEFAULT_EQUINOX_STARTUP _T_ECLIPSE("org.eclipse.equinox.launcher") #ifdef _WIN32 |