configure.ac | 2 +- cppu/source/uno/lbmap.cxx | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-)
New commits: commit 5ad06dbf643f20c706c24da7431a05c4def644f2 Author: Tor Lillqvist <t...@collabora.com> Date: Thu Dec 26 18:45:30 2013 +0200 WaE: unused function 'setNegativeBridge' Change-Id: I251f93f421972f8e5ab346af29152cebc17ab875 diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 4f281ba..6fb589e 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -313,7 +313,9 @@ static inline OUString getBridgeName( aBridgeName.append( EnvDcp::getTypeName(rTo.getTypeName()) ); return aBridgeName.makeStringAndClear(); } -//================================================================================================== + +#ifndef DISABLE_DYNLOADING + static inline void setNegativeBridge( const OUString & rBridgeName ) SAL_THROW(()) { @@ -322,6 +324,8 @@ static inline void setNegativeBridge( const OUString & rBridgeName ) rData.aNegativeLibs.insert( rBridgeName ); } +#endif + #ifdef DISABLE_DYNLOADING static uno_ext_getMappingFunc selectMapFunc( const OUString & rBridgeName ) commit 403d5ed5b85ab1dc30a1f84d8624be56aa47d8f2 Author: Tor Lillqvist <t...@collabora.com> Date: Thu Dec 26 18:18:10 2013 +0200 Accept also the iOS 7.1 SDK Change-Id: I1e93d23be2f7738062f419680872b94d2ccdcc8c diff --git a/configure.ac b/configure.ac index 0792f6e..12c6ad6 100644 --- a/configure.ac +++ b/configure.ac @@ -2952,7 +2952,7 @@ if test $_os = iOS; then xcode_developer=`xcode-select -print-path` pref_sdk_ver=7.0 - for sdkver in 7.0 6.1 6.0; do + for sdkver in 7.1 7.0 6.1 6.0; do t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk if test -d $t; then ios_sdk=$sdkver _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits