diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-03-22 00:35:19 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-03-23 15:21:31 +0000 |
| commit | 41f5c4bfce5f9b1c1043a51c73ae87bbe0673f3a (patch) | |
| tree | fd470a7db88bb338ec1e60d05dc2b6a08f7bca40 /basic/source/comp/exprtree.cxx | |
| parent | 1c17214e0442a821f82e8a98ba8634858ad7032f (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
(cherry picked from commit 2aa20cfb7a11dd8d86372af4065a5887a0b752ca)
Reviewed-on: https://gerrit.libreoffice.org/35530
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit c78d39066ace32e0324365bcf10882aa6e976a03)
Reviewed-on: https://gerrit.libreoffice.org/35533
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'basic/source/comp/exprtree.cxx')
0 files changed, 0 insertions, 0 deletions