0.pre7.113:

[sbcl.git] / src / code / target-c-call.lisp

diff --git a/src/code/target-c-call.lisp b/src/code/target-c-call.lisp
index df2459e..38b4cd1 100644 (file)
--- a/src/code/target-c-call.lisp
+++ b/src/code/target-c-call.lisp
@@ -14,20 +14,20 @@
 \f
 ;;;; 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)))
 \f
 (defun %naturalize-c-string (sap)
@@ -42,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)))))