Simplify (and robustify) regular PACKing

[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 09d9258..c978ac8 100644 (file)
--- a/src/code/target-c-call.lisp
+++ b/src/code/target-c-call.lisp
@@ -22,13 +22,20 @@
 (define-alien-type char (integer 8))
 (define-alien-type short (integer 16))
 (define-alien-type int (integer 32))
+#!-(and win32 x86-64)
 (define-alien-type long (integer #.sb!vm::n-machine-word-bits))
+#!+(and win32 x86-64)
+(define-alien-type long (integer 32))
+
 (define-alien-type long-long (integer 64))
 
 (define-alien-type unsigned-char (unsigned 8))
 (define-alien-type unsigned-short (unsigned 16))
 (define-alien-type unsigned-int (unsigned 32))
+#!-(and win32 x86-64)
 (define-alien-type unsigned-long (unsigned #.sb!vm::n-machine-word-bits))
+#!+(and win32 x86-64)
+(define-alien-type unsigned-long (unsigned 32))
 (define-alien-type unsigned-long-long (unsigned 64))
 
 (define-alien-type float single-float)
@@ -81,4 +88,3 @@
       (declare (optimize (speed 3) (safety 0)))
     (let ((external-format (sb!impl::get-external-format-or-lose external-format)))
       (funcall (sb!impl::ef-read-c-string-fun external-format) sap element-type))))
-