diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-03-22 00:35:19 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-03-22 10:30:41 +0100 |
| commit | 2aa20cfb7a11dd8d86372af4065a5887a0b752ca (patch) | |
| tree | 668992b2f5a5066bcdc6c00d4e260d38d1717174 /jvmfwk/plugins | |
| parent | 5277b43814568af84f00d9be1de7f985f758f249 (diff) | |
jvmfwk: fix JVM detection on 64-bit Windows
_WIN32 is also defined on 64-bit Windows so reorder these ifdefs.
Should i be surprised that this breaks several dbaccess tests
for me but all tinderboxes are green?
(regression from 9143dd4ebe37b608e43d04434cf831624bf55b65)
Change-Id: Id917952d3135768355af711688ff70bf6c019a6e
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx index cb8063e0555e..948c99dfe876 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx @@ -211,10 +211,10 @@ bool VendorBase::isValidArch() const // It is not defined what the exact values are. // Oracle JRE 8 has "x86" and "amd64", the others were found at http://lopica.sourceforge.net/os.html . // There might still be missing some options; we need to extend the check once we find out. -#if defined _WIN32 - return m_sArch == "x86" || m_sArch == "i386" || m_sArch == "i686"; -#elif defined _WIN64 +#if defined _WIN64 return m_sArch == "amd64" || m_sArch == "x86_64"; +#elif defined _WIN32 + return m_sArch == "x86" || m_sArch == "i386" || m_sArch == "i686"; #else (void)this; return true; |