diff options
author | Ken Raeburn <raeburn@raeburn.org> | 2009-10-29 12:16:12 -0400 |
---|---|---|
committer | Ken Raeburn <raeburn@raeburn.org> | 2009-10-30 18:41:11 -0400 |
commit | b4246e5b2235bd01a24a5069ed683fc3c0f6f18c (patch) | |
tree | 9652e7fa82c336ff9cc7f25dd7e86327343b8d2a | |
parent | 9515ef7237bc9709736f625b364448f2a80f73d8 (diff) | |
download | guile-b4246e5b2235bd01a24a5069ed683fc3c0f6f18c.tar.gz |
Clean up some uses of old GC macros that don't exist any more.
* libguile/deprecated.h (SCM_GC8MARKP, SCM_SETGC8MARK, SCM_CLRGC8MARK):
Delete.
* libguile/gc.c (scm_assert_cell_valid): Remove check of SCM_GC_MARK_P.
-rw-r--r-- | libguile/deprecated.h | 3 | ||||
-rw-r--r-- | libguile/gc.c | 13 |
2 files changed, 1 insertions, 15 deletions
diff --git a/libguile/deprecated.h b/libguile/deprecated.h index ed1a105ee..5680d09e5 100644 --- a/libguile/deprecated.h +++ b/libguile/deprecated.h @@ -120,9 +120,6 @@ SCM_DEPRECATED SCM scm_unprotect_object (SCM obj); (SCM_SETCDR ((x), SCM_PACK (SCM_UNPACK (SCM_CDR (x)) | (y)))) #define SCM_FREEP(x) (0) #define SCM_NFREEP(x) (1) -#define SCM_GC8MARKP(x) SCM_GC_MARK_P (x) -#define SCM_SETGC8MARK(x) SCM_SET_GC_MARK (x) -#define SCM_CLRGC8MARK(x) SCM_CLEAR_GC_MARK (x) #define SCM_GCTYP16(x) SCM_TYP16 (x) #define SCM_GCCDR(x) SCM_CDR (x) SCM_DEPRECATED void scm_remember (SCM * ptr); diff --git a/libguile/gc.c b/libguile/gc.c index 9c56d0412..96e3c306f 100644 --- a/libguile/gc.c +++ b/libguile/gc.c @@ -146,18 +146,7 @@ scm_assert_cell_valid (SCM cell) */ if (scm_expensive_debug_cell_accesses_p) scm_i_expensive_validation_check (cell); -#if (SCM_DEBUG_MARKING_API == 0) - if (!SCM_GC_MARK_P (cell)) - { - fprintf (stderr, - "scm_assert_cell_valid: this object is unmarked. \n" - "It has been garbage-collected in the last GC run: " - "%lux\n", - (unsigned long) SCM_UNPACK (cell)); - abort (); - } -#endif /* SCM_DEBUG_MARKING_API */ - + scm_i_cell_validation_already_running = 0; /* re-enable */ } } |