summaryrefslogtreecommitdiff
path: root/libguile/dynl.c
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>2004-10-22 13:01:59 +0000
committerMarius Vollmer <mvo@zagadka.de>2004-10-22 13:01:59 +0000
commita8255dca087b3ea05dbd95e0b0ddd85c1d94641d (patch)
tree581e2e53ca2834b9fdc47f104f521240359b8675 /libguile/dynl.c
parentc62a2bb99f84fa019fc5b0c5d8ee84ad029b1d42 (diff)
downloadguile-a8255dca087b3ea05dbd95e0b0ddd85c1d94641d.tar.gz
* Makefile.am (INCLUDES): Use @LTDLINC@ instead of
"-I$(top_srcdir)/libguile-ltdl". (libguile_la_LIBADD): Use @LIBLTDL@ instead of "../libguile-ltdl/libguile-ltdl.a". * guile.c, dynl.c: Switched to using libltdl directly. Replaced all references to scm_lt_* with just lt_*. Include <ltdl.h> instead of <libguile-ltdl.h>.
Diffstat (limited to 'libguile/dynl.c')
-rw-r--r--libguile/dynl.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libguile/dynl.c b/libguile/dynl.c
index ad2b3a32a..ab0d011fe 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -53,7 +53,7 @@ maybe_drag_in_eprintf ()
#include "libguile/validate.h"
#include "libguile/dynwind.h"
-#include "guile-ltdl.h"
+#include <ltdl.h>
/*
From the libtool manual: "Note that libltdl is not threadsafe,
@@ -68,15 +68,15 @@ maybe_drag_in_eprintf ()
static void *
sysdep_dynl_link (const char *fname, const char *subr)
{
- scm_lt_dlhandle handle;
- handle = scm_lt_dlopenext (fname);
+ lt_dlhandle handle;
+ handle = lt_dlopenext (fname);
if (NULL == handle)
{
SCM fn;
SCM msg;
fn = scm_from_locale_string (fname);
- msg = scm_from_locale_string (scm_lt_dlerror ());
+ msg = scm_from_locale_string (lt_dlerror ());
scm_misc_error (subr, "file: ~S, message: ~S", scm_list_2 (fn, msg));
}
return (void *) handle;
@@ -85,9 +85,9 @@ sysdep_dynl_link (const char *fname, const char *subr)
static void
sysdep_dynl_unlink (void *handle, const char *subr)
{
- if (scm_lt_dlclose ((scm_lt_dlhandle) handle))
+ if (lt_dlclose ((lt_dlhandle) handle))
{
- scm_misc_error (subr, (char *) scm_lt_dlerror (), SCM_EOL);
+ scm_misc_error (subr, (char *) lt_dlerror (), SCM_EOL);
}
}
@@ -96,10 +96,10 @@ sysdep_dynl_func (const char *symb, void *handle, const char *subr)
{
void *fptr;
- fptr = scm_lt_dlsym ((scm_lt_dlhandle) handle, symb);
+ fptr = lt_dlsym ((lt_dlhandle) handle, symb);
if (!fptr)
{
- scm_misc_error (subr, (char *) scm_lt_dlerror (), SCM_EOL);
+ scm_misc_error (subr, (char *) lt_dlerror (), SCM_EOL);
}
return fptr;
}
@@ -107,7 +107,7 @@ sysdep_dynl_func (const char *symb, void *handle, const char *subr)
static void
sysdep_dynl_init ()
{
- scm_lt_dlinit ();
+ lt_dlinit ();
}
scm_t_bits scm_tc16_dynamic_obj;