From cee2655445319133095b0f6b19fc5b31d321099f Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Thu, 10 Dec 2015 17:38:06 +0100 Subject: [PATCH] Kill check for ancient FreeBSD version Change-Id: Ia6f7d55d2d8d346695658549d2e86eef77215377 Reviewed-on: https://gerrit.libreoffice.org/20625 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- 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(-) diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx index 61ae30732762..feaa3945d231 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(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 47a50040ab28..20c402faaef4 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(dlsym( m_hApp, symName.getStr() )); -#endif if (rtti) {