summaryrefslogtreecommitdiff
path: root/libguile/extensions.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2021-01-22 16:39:11 +0100
committerAndy Wingo <wingo@pobox.com>2021-02-03 23:02:21 +0100
commit2e26538d6a51bdd6c2e68ad4539ab3750ef8670a (patch)
tree85f3f2ae182708804c673e95dc3a739d868771a5 /libguile/extensions.c
parent480d86df6847deb55db6731811407c268d2254ed (diff)
downloadguile-2e26538d6a51bdd6c2e68ad4539ab3750ef8670a.tar.gz
Replace libltdl with raw dlopen, dlsym
* NEWS: Update. * am/bootstrap.am (SOURCES): * module/Makefile.am (SOURCES): Add system/foreign-library.scm. * configure.ac: Replace ltdl check with -ldl check. * libguile/dynl.c: Rewrite to just expose core dlopen / dlsym / etc to a helper Scheme module. (scm_dynamic_link, scm_dynamic_pointer, scm_dynamic_function) (scm_dynamic_object_p, scm_dynamic_call): Rewrite in terms of (system foreign-library). * libguile/extensions.c (load_extension): Avoid scm_dynamic_call. * module/system/foreign-library.scm: New file. * module/oop/goops.scm (<dynamic-object>): Hackily export <foreign-library> instead of a class here. * doc/ref/api-foreign.texi (Foreign Function Interface): Rewrite to only document the new interfaces. Eventually we will deprecate dynamic-link and friends. * doc/ref/guile.texi (API Reference): Move Foreign Objects after Foreign Function Interface. Seems there should be some closer relationship but this will do for now. * doc/ref/tour.texi (Putting Extensions into Modules): * doc/ref/libguile-parallel.texi (Parallel Installations): Update for rename of Modules and Extensions to Foreign Extensions. * libguile/deprecated.h: * libguile/deprecated.c (scm_dynamic_unlink): Deprecate. * libguile/guile.c: Remove ltdl include. * test-suite/tests/foreign.test: Update tests to use new API, and update error expectations.
Diffstat (limited to 'libguile/extensions.c')
-rw-r--r--libguile/extensions.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libguile/extensions.c b/libguile/extensions.c
index a094159d4..61c975e16 100644
--- a/libguile/extensions.c
+++ b/libguile/extensions.c
@@ -1,4 +1,4 @@
-/* Copyright 2001,2002,2004,2006,2009-2011,2018-2019
+/* Copyright 2001,2002,2004,2006,2009-2011,2018-2019,2021
Free Software Foundation, Inc.
This file is part of Guile.
@@ -27,6 +27,7 @@
#include "dynwind.h"
#include "gc.h"
#include "gsubr.h"
+#include "foreign.h"
#include "strings.h"
#include "threads.h"
@@ -113,7 +114,9 @@ load_extension (SCM lib, SCM init)
/* Dynamically link the library. */
#if HAVE_MODULES
- scm_dynamic_call (init, scm_dynamic_link (lib));
+ SCM pointer = scm_dynamic_pointer (init, scm_dynamic_link (lib));
+ void (*f)(void) = scm_to_pointer (pointer);
+ f ();
#else
scm_misc_error ("load-extension",
"extension ~S:~S not registered and dynamic-link disabled",