X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fgc.lisp;h=f66fbe171ef731e885d2b2f64c2929e0901f2c33;hb=47bcbbb709e9e35e38e34ef2ea658f5a8eb0804d;hp=7e20cd4550101b8a1874b226403f6227eb2c6a3e;hpb=80722c917cade18ab933fd313b13c56c6073ae01;p=sbcl.git

diff --git a/src/code/gc.lisp b/src/code/gc.lisp
index 7e20cd4..f66fbe1 100644
--- a/src/code/gc.lisp
+++ b/src/code/gc.lisp
@@ -42,11 +42,11 @@
           (current-dynamic-space-start))))
 
 (defun static-space-usage ()
-  (- (* sb!vm:*static-space-free-pointer* sb!vm:word-bytes)
+  (- (* sb!vm:*static-space-free-pointer* sb!vm:n-word-bytes)
      sb!vm:static-space-start))
 
 (defun read-only-space-usage ()
-  (- (* sb!vm::*read-only-space-free-pointer* sb!vm:word-bytes)
+  (- (* sb!vm::*read-only-space-free-pointer* sb!vm:n-word-bytes)
      sb!vm:read-only-space-start))
 
 (defun control-stack-usage ()
@@ -239,13 +239,13 @@ function should notify the user that the system has finished GC'ing.")
 
 ;;;; internal GC
 
-(sb!alien:def-alien-routine collect-garbage sb!c-call:int
+(sb!alien:define-alien-routine collect-garbage sb!c-call:int
   #!+gencgc (last-gen sb!c-call:int))
 
-(sb!alien:def-alien-routine set-auto-gc-trigger sb!c-call:void
+(sb!alien:define-alien-routine set-auto-gc-trigger sb!c-call:void
   (dynamic-usage sb!c-call:unsigned-long))
 
-(sb!alien:def-alien-routine clear-auto-gc-trigger sb!c-call:void)
+(sb!alien:define-alien-routine clear-auto-gc-trigger sb!c-call:void)
 
 ;;; This variable contains the function that does the real GC. This is
 ;;; for low-level GC experimentation. Do not touch it if you do not
@@ -285,7 +285,7 @@ function should notify the user that the system has finished GC'ing.")
 				  *soft-heap-limit*)))
       (when soft-heap-limit-exceeded?
 	(cerror "Continue with GC."
-		"soft heap limit exceeded (temporary new limit=~D)"
+		"soft heap limit exceeded (temporary new limit=~W)"
 		*soft-heap-limit*))
       (when (and *gc-trigger* (> pre-gc-dynamic-usage *gc-trigger*))
 	(setf *need-to-collect-garbage* t))