summaryrefslogtreecommitdiff
path: root/libguile/hooks.c
diff options
context:
space:
mode:
authorNeil Jerram <neil@ossau.uklinux.net>2007-12-29 01:35:33 +0000
committerNeil Jerram <neil@ossau.uklinux.net>2007-12-29 01:35:33 +0000
commit5c004b6d6a6acca5327ca1e7cdf766c5edfa5548 (patch)
tree6e42914dae4c0b85e22000900cba40253011d191 /libguile/hooks.c
parent70a4404429e198f37f52ddf73f6d9336277ed54c (diff)
downloadguile-5c004b6d6a6acca5327ca1e7cdf766c5edfa5548.tar.gz
* gc.c (mark_gc_async): Change "func_data" to "fn_data", to avoid
clash with AIX header file. * hooks.c (scm_c_hook_add, scm_c_hook_remove): Same again. * hooks.h (scm_t_c_hook_function, scm_c_hook_add, scm_c_hook_remove): Same again.
Diffstat (limited to 'libguile/hooks.c')
-rw-r--r--libguile/hooks.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/hooks.c b/libguile/hooks.c
index 0adc019f6..7d1dae30e 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;