luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 06:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'RTLD_DEFAULT' into 'main'

Browse Source 
Handle plugable g_modules through RTLD_DEFAULT for NetBSD

Closes #19

See merge request GNOME/glib!3014
This commit is contained in:
Philip Withnall 2022-10-26 09:47:51 +00:00
commit e11bf10eac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gmodule/gmodule-dl.c
View File

@ -167,7 +167,7 @@ _g_module_self (void)
* NULL is given, dlsym returns an appropriate pointer. * NULL is given, dlsym returns an appropriate pointer.
*/ */
lock_dlerror (); lock_dlerror ();
#if defined(__BIONIC__) #if defined(__BIONIC__) || defined(__NetBSD__)
handle = RTLD_DEFAULT; handle = RTLD_DEFAULT;
#else #else
handle = dlopen (NULL, RTLD_GLOBAL | RTLD_LAZY); handle = dlopen (NULL, RTLD_GLOBAL | RTLD_LAZY);
@ -182,7 +182,7 @@ _g_module_self (void)
static void static void
_g_module_close (gpointer handle) _g_module_close (gpointer handle)
{ {
#if defined(__BIONIC__) #if defined(__BIONIC__) || defined(__NetBSD__)
if (handle != RTLD_DEFAULT) if (handle != RTLD_DEFAULT)
#endif #endif
{ {