0.8.12.7: Merge package locks, AKA "what can go wrong with a 3783 line patch?"

[sbcl.git] / src / code / cross-sap.lisp

diff --git a/src/code/cross-sap.lisp b/src/code/cross-sap.lisp
index 0db3c16..739fa11 100644 (file)
--- a/src/code/cross-sap.lisp
+++ b/src/code/cross-sap.lisp
@@ -18,13 +18,13 @@
 (defstruct (system-area-pointer (:constructor make-sap)
                                (:conc-name "SAP-"))
   ;; the integer representation of the address
-  (int (error "missing SAP-INT argument") :type sap-int-type :read-only t))
+  (int (error "missing SAP-INT argument") :type sap-int :read-only t))
 
 ;;; cross-compilation-host analogues of target-CMU CL primitive SAP operations
 (defun int-sap (int)
   (make-sap :int int))
 (defun sap+ (sap offset)
-  (declare (type system-area-pointer sap) (type sap-int-type offset))
+  (declare (type system-area-pointer sap) (type sap-int offset))
   (make-sap :int (+ (sap-int sap) offset)))
 #.`(progn
      ,@(mapcar (lambda (info)
@@ -46,7 +46,7 @@
                   (defun ,name (sap offset)
                     (declare (ignore sap offset))
                     (sap-ref-stub ',name))
-                  ,@(let ((setter-stub (gensym "SAP-SETTER-STUB-")))
+                  ,@(let ((setter-stub (gensym "SETTER-STUB-")))
                       `((defun ,setter-stub (foo sap offset)
                           (declare (ignore foo sap offset))
                           (sap-ref-stub '(setf ,name)))