X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Ftarget-unithread.lisp;h=89f7bb2239bdfddff0302a67bdce8bf110c07fd4;hb=89c5e67daff0215420fb0998b8e20915ddea1437;hp=4fc86d5f92580f8152845a2b6ffea2b6b3f79291;hpb=a7c2f2622f1ceeeb3459cb6bbcf261bda1ff2327;p=sbcl.git

diff --git a/src/code/target-unithread.lisp b/src/code/target-unithread.lisp
index 4fc86d5..89f7bb2 100644
--- a/src/code/target-unithread.lisp
+++ b/src/code/target-unithread.lisp
@@ -16,11 +16,11 @@
 (defun sb!vm::current-thread-offset-sap (n) 
   (declare (type (unsigned-byte 27) n))
   (sb!sys:sap-ref-sap (alien-sap (extern-alien "all_threads" (* t))) 
-	       (* n 4)))
+	       (* n sb!vm:n-word-bytes)))
 
 (defun current-thread-id ()
   (sb!sys:sap-ref-32 (alien-sap (extern-alien "all_threads" (* t))) 
-	       (* sb!vm::thread-pid-slot 4)))
+	       (* sb!vm::thread-pid-slot sb!vm:n-word-bytes)))
 
 (defun reap-dead-threads ())
 
@@ -37,7 +37,7 @@
 ;;;; the higher-level locking operations are based on waitqueues
 
 (defstruct waitqueue
-  (name nil :type (or null simple-base-string))
+  (name nil :type (or null simple-string))
   (lock 0)
   (data nil))