mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-17 01:00:20 +02:00
Code Activity

* Makefile.am (INCLUDES): Include from ../libguile-ltdl/ instead

Browse source 
of from $(INCLTDL).
(libguile_la_LIBADD): Use ../libguile-ltdl/libguile-ltdl.la
instead of $(LIBLTDL).

* guile.c: Include "guile-ltdl.h" instead of "libltdl/ltdl.h".
(main): switch to scm_lt_dlset_preloaded_symbols;

* dynl.c: Include "guile-ltdl.h" instead of "libltdl/ltdl.h".
(sysdep_dynl_link): switch to scm_lt_dlhandle, scm_lt_dlopenext,
and scm_lt_dlerror.
(sysdep_dynl_unlink): switch to scm_lt_dlhandle, scm_lt_dlclose,
and scm_lt_dlerror.
(sysdep_dynl_func): switch to scm_lt_dlhandle, scm_lt_dlsym, and
scm_lt_dlerror.
(sysdep_dynl_init): switch to scm_lt_dlinit();
This commit is contained in:
Marius Vollmer 2002-10-25 16:26:07 +00:00
parent a05b4f6e02
commit abeff04457
3 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libguile/dynl.c
View file

@ -237,13 +237,13 @@ SCM_DEFINE (scm_clear_registered_modules, "c-clear-registered-modules", 0, 0, 0,
#ifdef DYNAMIC_LINKING
#include "libltdl/ltdl.h"
#include "guile-ltdl.h"
static void *
sysdep_dynl_link (const char *fname, const char *subr)
{
lt_dlhandle handle;
handle = lt_dlopenext (fname);
scm_lt_dlhandle handle;
handle = scm_lt_dlopenext (fname);
if (NULL == handle)
{
SCM fn;
@ -251,7 +251,7 @@ sysdep_dynl_link (const char *fname, const char *subr)
SCM_ALLOW_INTS;
fn = scm_makfrom0str (fname);
msg = scm_makfrom0str (lt_dlerror ());
msg = scm_makfrom0str (scm_lt_dlerror ());
scm_misc_error (subr, "file: ~S, message: ~S", scm_list_2 (fn, msg));
}
return (void *) handle;
@ -260,10 +260,10 @@ sysdep_dynl_link (const char *fname, const char *subr)
static void
sysdep_dynl_unlink (void *handle, const char *subr)
{
if (lt_dlclose ((lt_dlhandle) handle))
if (scm_lt_dlclose ((scm_lt_dlhandle) handle))
{
SCM_ALLOW_INTS;
scm_misc_error (subr, (char *) lt_dlerror (), SCM_EOL);
scm_misc_error (subr, (char *) scm_lt_dlerror (), SCM_EOL);
}
}
@ -272,11 +272,11 @@ sysdep_dynl_func (const char *symb, void *handle, const char *subr)
{
void *fptr;
fptr = lt_dlsym ((lt_dlhandle) handle, symb);
fptr = scm_lt_dlsym ((scm_lt_dlhandle) handle, symb);
if (!fptr)
{
SCM_ALLOW_INTS;
scm_misc_error (subr, (char *) lt_dlerror (), SCM_EOL);
scm_misc_error (subr, (char *) scm_lt_dlerror (), SCM_EOL);
}
return fptr;
}
@ -284,7 +284,7 @@ sysdep_dynl_func (const char *symb, void *handle, const char *subr)
static void
sysdep_dynl_init ()
{
lt_dlinit ();
scm_lt_dlinit ();
}
#else