1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-16 16:50:21 +02:00

Merge branch 'master' into boehm-demers-weiser-gc

Conflicts:
	libguile/Makefile.am
	libguile/coop-defs.h
	libguile/gc-card.c
	libguile/gc-freelist.c
	libguile/gc-malloc.c
	libguile/gc-mark.c
	libguile/gc-segment.c
	libguile/gc.c
	libguile/gc.h
	libguile/gc_os_dep.c
	libguile/hashtab.c
	libguile/hashtab.h
	libguile/inline.h
	libguile/private-gc.h
	libguile/struct.c
	libguile/struct.h
	libguile/threads.c
	libguile/threads.h
	libguile/vectors.h
	libguile/weaks.h
	test-suite/tests/gc.test
This commit is contained in:
Ludovic Courtès 2008-09-10 23:09:30 +02:00
commit 6f03035fe8
298 changed files with 15438 additions and 3275 deletions

View file

@ -50,7 +50,7 @@ scm_c_hook_init (scm_t_c_hook *hook, void *hook_data, scm_t_c_hook_type type)
void
scm_c_hook_add (scm_t_c_hook *hook,
scm_t_c_hook_function func,
void *func_data,
void *fn_data,
int appendp)
{
scm_t_c_hook_entry *entry = scm_malloc (sizeof (scm_t_c_hook_entry));
@ -60,19 +60,19 @@ scm_c_hook_add (scm_t_c_hook *hook,
loc = &(*loc)->next;
entry->next = *loc;
entry->func = func;
entry->data = func_data;
entry->data = fn_data;
*loc = entry;
}
void
scm_c_hook_remove (scm_t_c_hook *hook,
scm_t_c_hook_function func,
void *func_data)
void *fn_data)
{
scm_t_c_hook_entry **loc = &hook->first;
while (*loc)
{
if ((*loc)->func == func && (*loc)->data == func_data)
if ((*loc)->func == func && (*loc)->data == fn_data)
{
scm_t_c_hook_entry *entry = *loc;
*loc = (*loc)->next;