X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-c-call.lisp;h=38b4cd114c20a0ccf9eaccd6273f26e2990d01cd;hb=cd176690400f8b6fa23faa4dc6fa8494bcbce480;hp=65e84786c51e7d89a9fa419a63a02e4d9561ab0e;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/code/target-c-call.lisp b/src/code/target-c-call.lisp
index 65e8478..38b4cd1 100644
--- a/src/code/target-c-call.lisp
+++ b/src/code/target-c-call.lisp
@@ -11,26 +11,23 @@
 ;;;; files for more information.
 
 (in-package "SB!C-CALL")
-
-(sb!int:file-comment
-  "$Header$")
 
 ;;;; extra types
 
-(def-alien-type char (integer 8))
-(def-alien-type short (integer 16))
-(def-alien-type int (integer 32))
-(def-alien-type long (integer #!-alpha 32 #!+alpha 64))
+(define-alien-type char (integer 8))
+(define-alien-type short (integer 16))
+(define-alien-type int (integer 32))
+(define-alien-type long (integer #!-alpha 32 #!+alpha 64))
 
-(def-alien-type unsigned-char (unsigned 8))
-(def-alien-type unsigned-short (unsigned 16))
-(def-alien-type unsigned-int (unsigned 32))
-(def-alien-type unsigned-long (unsigned #!-alpha 32 #!+alpha 64))
+(define-alien-type unsigned-char (unsigned 8))
+(define-alien-type unsigned-short (unsigned 16))
+(define-alien-type unsigned-int (unsigned 32))
+(define-alien-type unsigned-long (unsigned #!-alpha 32 #!+alpha 64))
 
-(def-alien-type float single-float)
-(def-alien-type double double-float)
+(define-alien-type float single-float)
+(define-alien-type double double-float)
 
-(def-alien-type-translator void ()
+(define-alien-type-translator void ()
   (parse-alien-type '(values) (sb!kernel:make-null-lexenv)))
 
 (defun %naturalize-c-string (sap)
@@ -45,6 +42,6 @@
        (let ((result (make-string length)))
 	 (sb!kernel:copy-from-system-area (alien-sap ptr) 0
 					  result (* sb!vm:vector-data-offset
-						    sb!vm:word-bits)
-					  (* length sb!vm:byte-bits))
+						    sb!vm:n-word-bits)
+					  (* length sb!vm:n-byte-bits))
 	 result)))))