summaryrefslogtreecommitdiff
path: root/cli_ure
diff options
context:
space:
mode:
authorComputingDwarf <Rechenelf@googlemail.com>2017-03-12 17:38:59 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-22 11:20:24 +0100
commit3b2863596f26a8d32a5bc322bbbf51cad403c9fb (patch)
tree131fbbdedc02274c25b85ad508996e6fdcac3e84 /cli_ure
parent536519657faca38fe2ea680366474f10d6a420fe (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?
Diffstat (limited to 'cli_ure')
-rw-r--r--cli_ure/source/uno_bridge/cli_bridge.cxx5
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);