diff options
author | Ludovic Courtès <ludo@gnu.org> | 2008-09-10 23:09:30 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2008-09-10 23:09:30 +0200 |
commit | 6f03035fe80d1c25ffadc42ec59c473402f65f60 (patch) | |
tree | a552a077bafe408ced8737674aecdf3007f31679 /libguile/hooks.c | |
parent | 328efeb9a66dddcf78a24fad96d3db58e9c3375d (diff) | |
parent | c5cd474d8c37bf32d7236e63d754a0eee9eb9071 (diff) | |
download | guile-6f03035fe80d1c25ffadc42ec59c473402f65f60.tar.gz |
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
Diffstat (limited to 'libguile/hooks.c')
-rw-r--r-- | libguile/hooks.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/hooks.c b/libguile/hooks.c index 78adec0cd..787382983 100644 --- a/libguile/hooks.c +++ b/libguile/hooks.c @@ -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; |