mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-09 21:40:33 +02:00
Code Activity

* gc.c (mark_gc_async): Change "func_data" to "fn_data", to avoid

Browse source 
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.
This commit is contained in:
Neil Jerram 2007-12-29 01:33:54 +00:00
parent 7c680febe5
commit 7c6861e1cc
4 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libguile/ChangeLog
View file

@ -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.

2
libguile/gc.c
View file

@ -971,7 +971,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

8
libguile/hooks.c
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;

6
libguile/hooks.h
View file

@ -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);
/*