[Libreoffice-commits] .: bridges/source

[Tor Lillqvist]

 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 37b6a37a2634cbb7bbe6602c3cc45b9ffccc05a7
Author: Tor Lillqvist <t...@iki.fi>
Date:   Wed Mar 7 01:53:43 2012 +0200

    Fix compilation for simulator

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
index dc58f33..b5a5943 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
@@ -112,8 +112,6 @@ namespace arm
     }
 }
 
-#endif
-
 void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference 
* pReturnType, sal_uInt32* pRegisterReturn)
 {
     switch( pReturnType->eTypeClass )
@@ -160,6 +158,8 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, 
typelib_TypeDescriptionReference *
     }
 }
 
+#endif
+
 namespace
 {
 
@@ -200,7 +200,7 @@ void callVirtualMethod(
 
 #else
     volatile long edx = 0, eax = 0; // for register returns
-    void * stackptr;
+    void * stackptr = 0;
     asm volatile (
         "mov   %%esp, %6\n\t"
         "mov   %0, %%eax\n\t"
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits