From ba039b8e71391a923ad958285776786caa0e536d Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 5 Jun 2023 18:03:57 +0300 Subject: [PATCH] engine: drop XASH_DYNAMIC_DLADDR --- engine/common/crashhandler.c | 18 ------------------ engine/platform/posix/lib_posix.c | 18 ------------------ 2 files changed, 36 deletions(-) diff --git a/engine/common/crashhandler.c b/engine/common/crashhandler.c index cc94c5a3..e806cf0f 100644 --- a/engine/common/crashhandler.c +++ b/engine/common/crashhandler.c @@ -334,24 +334,6 @@ void Sys_RestoreCrashHandler( void ) static struct sigaction oldFilter; -#ifdef XASH_DYNAMIC_DLADDR -static int d_dladdr( void *sym, Dl_info *info ) -{ - static int (*dladdr_real) ( void *sym, Dl_info *info ); - - if( !dladdr_real ) - dladdr_real = dlsym( (void*)(size_t)(-1), "dladdr" ); - - memset( info, 0, sizeof( *info ) ); - - if( !dladdr_real ) - return -1; - - return dladdr_real( sym, info ); -} -#define dladdr d_dladdr -#endif - static int Sys_PrintFrame( char *buf, int len, int i, void *addr ) { Dl_info dlinfo; diff --git a/engine/platform/posix/lib_posix.c b/engine/platform/posix/lib_posix.c index 62c40346..29172cd4 100644 --- a/engine/platform/posix/lib_posix.c +++ b/engine/platform/posix/lib_posix.c @@ -200,24 +200,6 @@ void *COM_FunctionFromName( void *hInstance, const char *pName ) return COM_GetProcAddress( hInstance, pName ); } -#ifdef XASH_DYNAMIC_DLADDR -static int d_dladdr( void *sym, Dl_info *info ) -{ - static int (*dladdr_real) ( void *sym, Dl_info *info ); - - if( !dladdr_real ) - dladdr_real = dlsym( (void*)(size_t)(-1), "dladdr" ); - - memset( info, 0, sizeof( *info ) ); - - if( !dladdr_real ) - return -1; - - return dladdr_real( sym, info ); -} -#define dladdr d_dladdr -#endif - const char *COM_NameForFunction( void *hInstance, void *function ) { #ifdef XASH_DLL_LOADER