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/gc.h | |
| 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/gc.h')
| -rw-r--r-- | libguile/gc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/gc.h b/libguile/gc.h index 3f46655ef..db55abc18 100644 --- a/libguile/gc.h +++ b/libguile/gc.h @@ -3,7 +3,7 @@ #ifndef SCM_GC_H #define SCM_GC_H -/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -134,10 +134,10 @@ SCM_API int scm_debug_cells_gc_interval ; void scm_i_expensive_validation_check (SCM cell); #endif -SCM_API scm_i_pthread_mutex_t scm_i_gc_admin_mutex; +SCM_INTERNAL scm_i_pthread_mutex_t scm_i_gc_admin_mutex; #define scm_gc_running_p (SCM_I_CURRENT_THREAD->gc_running_p) -SCM_API scm_i_pthread_mutex_t scm_i_sweep_mutex; +SCM_INTERNAL scm_i_pthread_mutex_t scm_i_sweep_mutex; #ifdef __ia64__ void *scm_ia64_register_backing_store_base (void); |