mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-03-26 01:20:05 +01:00
Merge branch 'wip/pwithnall/3415-freebsd-gmodule' into 'main'
Revert "gmodule-dl: Use RTLD_DEFAULT on FreeBSD too" Closes #3415 See merge request GNOME/glib!4199
This commit is contained in:
commit
b0ac7acb8e
@ -167,7 +167,7 @@ _g_module_self (void)
|
||||
* NULL is given, dlsym returns an appropriate pointer.
|
||||
*/
|
||||
lock_dlerror ();
|
||||
#if defined(__ANDROID__) || defined(__NetBSD__) || defined(__FreeBSD__)
|
||||
#if defined(__ANDROID__) || defined(__NetBSD__)
|
||||
handle = RTLD_DEFAULT;
|
||||
#else
|
||||
handle = dlopen (NULL, RTLD_GLOBAL | RTLD_LAZY);
|
||||
@ -182,7 +182,7 @@ _g_module_self (void)
|
||||
static void
|
||||
_g_module_close (gpointer handle)
|
||||
{
|
||||
#if defined(__ANDROID__) || defined(__NetBSD__) || defined(__FreeBSD__)
|
||||
#if defined(__ANDROID__) || defined(__NetBSD__)
|
||||
if (handle != RTLD_DEFAULT)
|
||||
#endif
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user