diff options
author | Ludovic Courtes <ludovic.courtes@laas.fr> | 2006-06-25 22:42:19 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2008-09-10 20:27:34 +0200 |
commit | 986ec82209fe327e44dc897d8f5219b1f53ed939 (patch) | |
tree | 6fe27be780eebef2a160ae1e83fa49b0fcbac93e /libguile/init.c | |
parent | c6a35e35f76e800bd85cb28e6ace743aedd87e61 (diff) | |
download | guile-986ec82209fe327e44dc897d8f5219b1f53ed939.tar.gz |
Moved weak pair code into `weaks.[ch]'.
* libguile/hashtab.c: Don't include <gc/gc_typed.h> and <gc/gc.h>.
Updated users of weak
(wcar_cell_descr): Removed.
(wcdr_cell_descr): Removed.
(scm_weak_car_cell): Removed.
(scm_weak_cdr_cell): Removed.
(scm_doubly_weak_cell): Removed.
(SCM_WEAK_CELL_*_DELETED_P): Removed.
(SCM_WEAK_CELL_WORD): Removed.
(SCM_WEAK_CELL_C[AD]R): Removed.
(scm_hashtab_prehistory): Don't initialize weak pairs.
* libguile/init.c (scm_i_init_guile): Invoke `scm_weaks_prehistory ()'
before `scm_hashtab_prehistory ()' in order to initialize weak pairs.
* libguile/weaks.c: Include <gc/gc.h> and <gc/gc_typed.h>.
(wc[ad]r_cell_descr): New.
(scm_weak_c[ad]r_pair): New.
(scm_doubly_weak_pair): New.
(scm_weaks_prehistory): New.
* libguile/weaks.h (scm_weak_c[ad]r_pair): New declaration.
(scm_doubly_weak_pair): New declaration.
(SCM_WEAK_PAIR_WORD_DELETED_P): New.
(SCM_WEAK_PAIR_CAR_DELETED_P): New.
(SCM_WEAK_PAIR_CDR_DELETED_P): New.
(SCM_WEAK_PAIR_DELETED_P): New.
(SCM_WEAK_PAIR_WORD): New.
(SCM_WEAK_PAIR_CAR): New.
(SCM_WEAK_PAIR_CDR): New.
git-archimport-id: lcourtes@laas.fr--2005-libre/guile-core--boehm-gc--1.9--patch-39
Diffstat (limited to 'libguile/init.c')
-rw-r--r-- | libguile/init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libguile/init.c b/libguile/init.c index 44810be4e..46919f0fe 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -422,7 +422,9 @@ scm_i_init_guile (SCM_STACKITEM *base) scm_ports_prehistory (); scm_smob_prehistory (); scm_fluids_prehistory (); - scm_hashtab_prehistory (); /* requires storage_prehistory */ + scm_weaks_prehistory (); + scm_hashtab_prehistory (); /* requires storage_prehistory, and + weaks_prehistory */ #ifdef GUILE_DEBUG_MALLOC scm_debug_malloc_prehistory (); #endif |