diff --git a/src/CHANGELOG b/src/CHANGELOG index 8e392f703..660265b23 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1278,6 +1278,8 @@ ECLS 0.9 - (SETF #:GXXX), where #:GXXX is any uninterned symbol, should be a valid function name. + - Symbol GC moved from the COMMON-LISP package, to SI and CL-USER. + TODO: ===== diff --git a/src/c/alloc_2.d b/src/c/alloc_2.d index 74a19ecc0..41e0f8a29 100644 --- a/src/c/alloc_2.d +++ b/src/c/alloc_2.d @@ -281,7 +281,7 @@ ecl_register_root(cl_object *p) } cl_object -cl_gc(cl_object area) +si_gc(cl_object area) { GC_gcollect(); @(return) diff --git a/src/c/symbols_list.h b/src/c/symbols_list.h index 333e54555..306c355e0 100644 --- a/src/c/symbols_list.h +++ b/src/c/symbols_list.h @@ -1158,11 +1158,11 @@ cl_symbols[] = { #endif #ifdef GBC_BOEHM -{"GC", CL_ORDINARY, cl_gc, 1}, +{"SI::GC", SI_ORDINARY, si_gc, 1}, #endif #if !defined(GBC_BOEHM) -{"GC", CL_ORDINARY, cl_gc, -1}, +{"SI::GC", SI_ORDINARY, si_gc, -1}, {"SI::ALLOCATE", SI_ORDINARY, si_allocate, -1}, {"SI::ALLOCATED-PAGES", SI_ORDINARY, si_allocated_pages, -1}, {"SI::MAXIMUM-ALLOCATABLE-PAGES", SI_ORDINARY, si_maximum_allocatable_pages, -1}, diff --git a/src/h/external.h b/src/h/external.h index 6ada061dc..317079345 100644 --- a/src/h/external.h +++ b/src/h/external.h @@ -26,7 +26,7 @@ extern cl_object cl_alloc_instance(cl_index slots); extern cl_object make_cons(cl_object a, cl_object d); extern void cl_dealloc(void *p, cl_index s); #ifdef GBC_BOEHM -extern cl_object cl_gc(cl_object area); +extern cl_object si_gc(cl_object area); extern void *GC_malloc(size_t size); extern void *GC_malloc_atomic_ignore_off_page(size_t size); extern void GC_free(void *); @@ -394,7 +394,7 @@ extern void init_format(void); extern cl_object si_room_report _ARGS((int narg)); extern cl_object si_reset_gc_count _ARGS((int narg)); extern cl_object si_gc_time _ARGS((int narg)); -extern cl_object cl_gc(cl_object area); +extern cl_object si_gc(cl_object area); #define GC_enabled() GC_enable #define GC_enable() GC_enable = TRUE; #define GC_disable() GC_enable = FALSE; diff --git a/src/lsp/autoload.lsp b/src/lsp/autoload.lsp index 842577d5f..9e1a2aa59 100644 --- a/src/lsp/autoload.lsp +++ b/src/lsp/autoload.lsp @@ -248,7 +248,7 @@ NIL, then all packages are searched." ;;; Import functions which are useful for user interaction (in-package "CL-USER") -(import '(sys::help sys::help* #-boehm-gc sys::room)) +(import '(sys::help sys::help* #-boehm-gc sys::room sys::gc)) ;;; Pretty-print-formats. ;;;