diff options
| author | Andrew Niefer | 2010-07-15 16:51:11 +0000 |
|---|---|---|
| committer | Andrew Niefer | 2010-07-15 16:51:11 +0000 |
| commit | 27dd2ea351c00fa07ecfa39e6cd12740279d3519 (patch) | |
| tree | 9ea64883ec3e8e029cf8b0bb972d34ad31582d19 /bundles | |
| parent | 44e5a8e91ddb2bced043c5950af1b601cbb83fd4 (diff) | |
| download | rt.equinox.framework-27dd2ea351c00fa07ecfa39e6cd12740279d3519.tar.gz rt.equinox.framework-27dd2ea351c00fa07ecfa39e6cd12740279d3519.tar.xz rt.equinox.framework-27dd2ea351c00fa07ecfa39e6cd12740279d3519.zip | |
bug 320006 - isSunVM should return true for Oracle
Diffstat (limited to 'bundles')
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/make_version.mak | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/make_version.mak b/bundles/org.eclipse.equinox.executable/library/make_version.mak index ac88ef71f..d586682f7 100644 --- a/bundles/org.eclipse.equinox.executable/library/make_version.mak +++ b/bundles/org.eclipse.equinox.executable/library/make_version.mak @@ -10,5 +10,5 @@ #******************************************************************************* maj_ver=1 -min_ver=400 +min_ver=401 LIB_VERSION = $(maj_ver)$(min_ver) diff --git a/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c b/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c index 11ec827e6..8033224ae 100644 --- a/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c +++ b/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c @@ -78,6 +78,7 @@ typedef struct { #define COMPANY_NAME_KEY _T_ECLIPSE("\\StringFileInfo\\%04x%04x\\CompanyName") #define SUN_MICROSYSTEMS _T_ECLIPSE("Sun Microsystems") +#define ORACLE _T_ECLIPSE("Oracle") static void sendOpenFileMessage(HWND window) { _TCHAR* id; @@ -595,6 +596,9 @@ int isSunVM( _TCHAR * javaVM, _TCHAR * jniLib ) { if (_tcsncmp(value, SUN_MICROSYSTEMS, _tcslen(SUN_MICROSYSTEMS)) == 0) { result = 1; break; + } else if (_tcsncmp(value, ORACLE, _tcslen(ORACLE)) == 0) { + result = 1; + break; } } free(key); |