[Libreoffice-commits] core.git: bridges/source
Baptiste Daroussin
bapt at FreeBSD.org
Thu Dec 10 23:28:38 PST 2015
bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 8 --------
bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx | 4 ----
2 files changed, 12 deletions(-)
New commits:
commit cee2655445319133095b0f6b19fc5b31d321099f
Author: Baptiste Daroussin <bapt at FreeBSD.org>
Date: Thu Dec 10 17:38:06 2015 +0100
Kill check for ancient FreeBSD version
Change-Id: Ia6f7d55d2d8d346695658549d2e86eef77215377
Reviewed-on: https://gerrit.libreoffice.org/20625
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 61ae307..feaa394 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -100,11 +100,7 @@ public:
};
RTTI::RTTI()
-#if defined(FREEBSD) && __FreeBSD_version < 702104
- : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
-#endif
{
}
@@ -139,11 +135,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
buf.append( 'E' );
OString symName( buf.makeStringAndClear() );
-#if defined(FREEBSD) && __FreeBSD_version < 702104 /* #i22253# */
- rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-#else
rtti = static_cast<type_info *>(dlsym( m_hApp, symName.getStr() ));
-#endif
if (rtti)
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index 47a5004..20c402f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -95,11 +95,7 @@ std::type_info * RTTI::getRTTI(typelib_TypeDescription const & pTypeDescr)
buf.append( 'E' );
OString symName( buf.makeStringAndClear() );
-#if defined(FREEBSD) && __FreeBSD_version < 702104 /* #i22253# */
- rtti = (std::type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-#else
rtti = static_cast<std::type_info *>(dlsym( m_hApp, symName.getStr() ));
-#endif
if (rtti)
{
More information about the Libreoffice-commits
mailing list