luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-31 21:03:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/pwithnall/3415-freebsd-gmodule' into 'main'

Browse Source 
Revert "gmodule-dl: Use RTLD_DEFAULT on FreeBSD too"

Closes #3415

See merge request GNOME/glib!4199
This commit is contained in:
Philip Withnall 2024-08-26 10:36:20 +00:00
commit b0ac7acb8e
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(__ANDROID__) || defined(__NetBSD__) || defined(__FreeBSD__) #if defined(__ANDROID__) || 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(__ANDROID__) || defined(__NetBSD__) || defined(__FreeBSD__) #if defined(__ANDROID__) || defined(__NetBSD__)
if (handle != RTLD_DEFAULT) if (handle != RTLD_DEFAULT)
#endif #endif
{ {