diff options
| author | Neil Jerram <neil@ossau.uklinux.net> | 2007-12-29 01:35:33 +0000 |
|---|---|---|
| committer | Neil Jerram <neil@ossau.uklinux.net> | 2007-12-29 01:35:33 +0000 |
| commit | 5c004b6d6a6acca5327ca1e7cdf766c5edfa5548 (patch) | |
| tree | 6e42914dae4c0b85e22000900cba40253011d191 | |
| parent | 70a4404429e198f37f52ddf73f6d9336277ed54c (diff) | |
* 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.
| -rw-r--r-- | libguile/ChangeLog | 8 | ||||
| -rw-r--r-- | libguile/gc.c | 2 | ||||
| -rw-r--r-- | libguile/hooks.c | 8 | ||||
| -rw-r--r-- | libguile/hooks.h | 6 |
4 files changed, 16 insertions, 8 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 132130b7b..907e620a4 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,11 @@ +2007-12-29 Neil Jerram <neil@ossau.uklinux.net> + + * 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. + 2007-12-08 Ludovic Courtès <ludo@gnu.org> * __scm.h (SCM_EXPECT, SCM_LIKELY, SCM_UNLIKELY): New macros. diff --git a/libguile/gc.c b/libguile/gc.c index 12a0b581d..21932d9f2 100644 --- a/libguile/gc.c +++ b/libguile/gc.c @@ -1017,7 +1017,7 @@ gc_async_thunk (void) */ static void * mark_gc_async (void * hook_data SCM_UNUSED, - void *func_data SCM_UNUSED, + void *fn_data SCM_UNUSED, void *data SCM_UNUSED) { /* If cell access debugging is enabled, the user may choose to perform 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; diff --git a/libguile/hooks.h b/libguile/hooks.h index e6598cabf..69972c3e7 100644 --- a/libguile/hooks.h +++ b/libguile/hooks.h @@ -40,7 +40,7 @@ typedef enum scm_t_c_hook_type { } scm_t_c_hook_type; typedef void *(*scm_t_c_hook_function) (void *hook_data, - void *func_data, + void *fn_data, void *data); typedef struct scm_t_c_hook_entry { @@ -60,11 +60,11 @@ SCM_API void scm_c_hook_init (scm_t_c_hook *hook, scm_t_c_hook_type type); SCM_API 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_API void scm_c_hook_remove (scm_t_c_hook *hook, scm_t_c_hook_function func, - void *func_data); + void *fn_data); SCM_API void *scm_c_hook_run (scm_t_c_hook *hook, void *data); /* |