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

Kill check for ancient FreeBSD version

Browse Source 
Change-Id: Ia6f7d55d2d8d346695658549d2e86eef77215377
Reviewed-on: https://gerrit.libreoffice.org/20625
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
This commit is contained in:
Baptiste Daroussin
2015-12-10 17:38:06 +01:00
committed by Miklos Vajna
parent c68b47ea1a
commit cee2655445
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
View File

@@ -100,11 +100,7 @@ public:
}; };
RTTI::RTTI() RTTI::RTTI()
#if defined(FREEBSD) && __FreeBSD_version < 702104
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) ) : m_hApp( dlopen( 0, RTLD_LAZY ) )
#endif
{ {
} }
@@ -139,11 +135,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
buf.append( 'E' ); buf.append( 'E' );
OString symName( buf.makeStringAndClear() ); 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() )); rtti = static_cast<type_info *>(dlsym( m_hApp, symName.getStr() ));
#endif
if (rtti) if (rtti)
{ {

4
bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
View File

@@ -95,11 +95,7 @@ std::type_info * RTTI::getRTTI(typelib_TypeDescription const & pTypeDescr)
buf.append( 'E' ); buf.append( 'E' );
OString symName( buf.makeStringAndClear() ); 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() )); rtti = static_cast<std::type_info *>(dlsym( m_hApp, symName.getStr() ));
#endif
if (rtti) if (rtti)
{ {