[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - cli_ure/source

[Michael Stahl]

 cli_ure/source/native/native_share.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 32cee6bb153ede8a79b831ed0cf7a0256d73363c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Mar 29 12:03:50 2017 +0200

    cli_ure: fix another bad _WIN64 check (related tdf#94265)
    
    Same problem as commit 2aa20cfb7a11dd8d86372af4065a5887a0b752ca
    
    Change-Id: I02160c53870a021c742babf358e0d6172557ef21
    (cherry picked from commit cfaba15c589f882cc0bcce5cd07bdf3d30f547f6)
    Reviewed-on: https://gerrit.libreoffice.org/35839
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/cli_ure/source/native/native_share.h b/cli_ure/source/native/native_share.h
index 9b3ebe1ac9b9..1be1b3a082b3 100644
--- a/cli_ure/source/native/native_share.h
+++ b/cli_ure/source/native/native_share.h
@@ -91,10 +91,10 @@ inline void to_uno(
         reinterpret_cast< void ** >( &ret ),
         reinterpret_cast< void * >(
             ::System::Runtime::InteropServices::GCHandle::op_Explicit( handle )
-#if defined _WIN32
-            .ToInt32()
-#elif defined _WIN64
+#if defined _WIN64
             .ToInt64()
+#elif defined _WIN32
+            .ToInt32()
 #else
 #error ERROR: either _WIN64 or _WIN32 must be defined
             ERROR: either _WIN64 or _WIN32 must be defined