summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-03-07 01:53:43 +0200
committerTor Lillqvist <tml@iki.fi>2012-03-07 02:18:30 +0200
commit37b6a37a2634cbb7bbe6602c3cc45b9ffccc05a7 (patch)
tree2f1e79c6eaa59402edb5f4ce4de54dd9ed599801 /bridges
parent07cf4a4a21b4f8f9325e7a7243fba6295ec42a54 (diff)
Fix compilation for simulator
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
index dc58f33a016b..b5a59434e31b 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"