mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ios update to make TiledLibreOffice compile/link

Browse Source 
changes needed to make TiledLibreOffice compile/link for ios-simulator.

Remark:
autogen.input need to have --disable-pdfium due to a missing
<Carbon/Carbon.h>

Change-Id: I3e1af26d99c35c3c552510f28e13a7e530fca09f
Reviewed-on: https://gerrit.libreoffice.org/34145
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@libreoffice.org>
This commit is contained in:
jan Iversen
2017-02-10 21:13:56 +01:00
committed by jan iversen
parent 55519a18be
commit dd18f8ae55
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
View File

@@ -121,6 +121,7 @@ void cpp2uno_call(
case typelib_TypeClass_UNSIGNED_HYPER: case typelib_TypeClass_UNSIGNED_HYPER:
case typelib_TypeClass_DOUBLE: case typelib_TypeClass_DOUBLE:
pCppStack += sizeof(sal_Int32); // extra long pCppStack += sizeof(sal_Int32); // extra long
SAL_FALLTHROUGH;
default: default:
break; break;
} }
@@ -344,6 +345,7 @@ extern "C" void cpp_vtable_call(
TYPELIB_DANGER_RELEASE( pTD ); TYPELIB_DANGER_RELEASE( pTD );
} }
} // else perform queryInterface() } // else perform queryInterface()
SAL_FALLTHROUGH;
default: default:
cpp2uno_call( cpp2uno_call(
pCppI, aMemberDescr.get(), pCppI, aMemberDescr.get(),
@@ -425,6 +427,7 @@ unsigned char * codeSnippet(
break; break;
} }
} }
SAL_FALLTHROUGH;
case typelib_TypeClass_STRING: case typelib_TypeClass_STRING:
case typelib_TypeClass_TYPE: case typelib_TypeClass_TYPE:
case typelib_TypeClass_SEQUENCE: case typelib_TypeClass_SEQUENCE:

3
bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
View File

@@ -115,6 +115,7 @@ void callVirtualMethod(
case typelib_TypeClass_HYPER: case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER: case typelib_TypeClass_UNSIGNED_HYPER:
((long*)pRegisterReturn)[1] = edx; ((long*)pRegisterReturn)[1] = edx;
SAL_FALLTHROUGH;
case typelib_TypeClass_LONG: case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG: case typelib_TypeClass_UNSIGNED_LONG:
case typelib_TypeClass_CHAR: case typelib_TypeClass_CHAR:
@@ -221,6 +222,7 @@ static void cpp_call(
case typelib_TypeClass_UNSIGNED_HYPER: case typelib_TypeClass_UNSIGNED_HYPER:
case typelib_TypeClass_DOUBLE: case typelib_TypeClass_DOUBLE:
pCppStack += sizeof(sal_Int32); // extra long pCppStack += sizeof(sal_Int32); // extra long
SAL_FALLTHROUGH;
default: default:
break; break;
} }
@@ -453,6 +455,7 @@ void unoInterfaceProxyDispatch(
TYPELIB_DANGER_RELEASE( pTD ); TYPELIB_DANGER_RELEASE( pTD );
} }
} // else perform queryInterface() } // else perform queryInterface()
SAL_FALLTHROUGH;
default: default:
// dependent dispatch // dependent dispatch
cpp_call( cpp_call(

5
include/LibreOfficeKit/LibreOfficeKitInit.h
View File

@@ -42,7 +42,10 @@ extern "C"
#endif #endif
#define SEPARATOR '/' #define SEPARATOR '/'
inline void *lok_loadlib(const char *pFN) #ifndef __OBJC__
inline
#endif
void *lok_loadlib(const char *pFN)
{ {
return dlopen(pFN, RTLD_LAZY return dlopen(pFN, RTLD_LAZY
#if defined LOK_LOADLIB_GLOBAL #if defined LOK_LOADLIB_GLOBAL