mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 11:50:28 +02:00
bugfix: don't dynamic link if we found a registered extension
* libguile/extensions.c (load_extension): Don't do dynamic linking if we actually did find an extension in the list.
This commit is contained in:
parent
60ae5ca2a3
commit
a5fc657043
1 changed files with 5 additions and 0 deletions
|
@ -76,6 +76,7 @@ load_extension (SCM lib, SCM init)
|
||||||
{
|
{
|
||||||
extension_t *ext;
|
extension_t *ext;
|
||||||
char *clib, *cinit;
|
char *clib, *cinit;
|
||||||
|
int found = 0;
|
||||||
|
|
||||||
scm_dynwind_begin (0);
|
scm_dynwind_begin (0);
|
||||||
|
|
||||||
|
@ -89,10 +90,14 @@ load_extension (SCM lib, SCM init)
|
||||||
&& !strcmp (ext->init, cinit))
|
&& !strcmp (ext->init, cinit))
|
||||||
{
|
{
|
||||||
ext->func (ext->data);
|
ext->func (ext->data);
|
||||||
|
found = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
scm_dynwind_end ();
|
scm_dynwind_end ();
|
||||||
|
|
||||||
|
if (found)
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Dynamically link the library. */
|
/* Dynamically link the library. */
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue