summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-03-27 18:47:13 -0700
committerAndy Wingo <wingo@pobox.com>2009-03-27 18:47:13 -0700
commita5fc657043e1af9b2e79799059069f8172afb66c (patch)
tree47c4ce7c48d03269af74638f1a2e361355844870
parent60ae5ca2a31a89b8930089f7dbfa3a99ac727383 (diff)
downloadguile-wingo.tar.gz
bugfix: don't dynamic link if we found a registered extensionwingo
* libguile/extensions.c (load_extension): Don't do dynamic linking if we actually did find an extension in the list.
-rw-r--r--libguile/extensions.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libguile/extensions.c b/libguile/extensions.c
index 1090b8bd5..29cb58cbe 100644
--- a/libguile/extensions.c
+++ b/libguile/extensions.c
@@ -76,6 +76,7 @@ load_extension (SCM lib, SCM init)
{
extension_t *ext;
char *clib, *cinit;
+ int found = 0;
scm_dynwind_begin (0);
@@ -89,10 +90,14 @@ load_extension (SCM lib, SCM init)
&& !strcmp (ext->init, cinit))
{
ext->func (ext->data);
+ found = 1;
break;
}
scm_dynwind_end ();
+
+ if (found)
+ return;
}
/* Dynamically link the library. */