diff options
| author | ComputingDwarf <Rechenelf@googlemail.com> | 2017-03-12 17:38:59 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-03-29 12:34:29 +0000 |
| commit | 4fbc70bcd790fad04ff158eafe899d47a0b624d6 (patch) | |
| tree | b59b3a223602e6f73db24ce1278bc1a836a5f4c3 | |
| parent | b96c52baa6b9607d9a31cd1b34162e4ee041f9b6 (diff) | |
tdf#94265: Correct the error
Always _WIN32 is defined, even in Win64. So the check must be to _WIN64 and then to _WIN32.
Hope no more lines like this in code.
Can you test programs with SDK 64 Bit?
(cherry picked from commit 3b2863596f26a8d32a5bc322bbbf51cad403c9fb)
Change-Id: Ibc6d486fba2077e924efe584d74659f4fe5ab525
Reviewed-on: https://gerrit.libreoffice.org/35836
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_bridge.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 3fb8f98f6dfc..da8d0852e927 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -131,9 +131,10 @@ void SAL_CALL Mapping_uno2cli( if(cliI) { ptr= sri::GCHandle::ToIntPtr(sri::GCHandle::Alloc(cliI)) -#ifdef _WIN32 +#ifdef _WIN64 + .ToInt64(); +#else /* defined(_WIN32) */ .ToInt32(); -#else /* defined(_WIN64) */ .ToInt64(); #endif } (*ppOut)= reinterpret_cast<void*>(ptr); |