r10393: fix sbcl compilation

[uffi.git] / src / aggregates.lisp

diff --git a/src/aggregates.lisp b/src/aggregates.lisp
index 5d0bcf75bfd07b0f7896efdc1d11091d7e0ce261..f02f2033e29dfbd460927cca138eb844d7877302 100644 (file)
--- a/src/aggregates.lisp
+++ b/src/aggregates.lisp
@@ -227,17 +227,18 @@ of the enum-name name, separator-string, and field-name"
       (setf (aref a i) (uffi:deref-array s '(:array :unsigned-byte) i)))))
 
 #+sbcl
-(sb-ext:without-package-locks
- (defvar *system-copy-fn* (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
-                             (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL")
-                           (intern "COPY-UB8-FROM-SYSTEM-AREA" "SB-KERNEL")))
- (defconstant *system-copy-offset* (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
-                                      (* sb-vm:vector-data-offset sb-vm:n-word-bits)
-                                    0))
- (defconstant *system-copy-multiplier* (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
-                                          sb-vm:n-byte-bits
-                                        1)))
-
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (sb-ext:without-package-locks
+      (defvar *system-copy-fn* (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
+                                  (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL")
+                                  (intern "COPY-UB8-FROM-SYSTEM-AREA" "SB-KERNEL")))
+    (defconstant +system-copy-offset+ (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
+                                         (* sb-vm:vector-data-offset sb-vm:n-word-bits)
+                                         0))
+    (defconstant +system-copy-multiplier+ (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
+                                             sb-vm:n-byte-bits
+                                             1))))
+  
 
 #+sbcl
 (defun convert-from-foreign-usb8 (s len)
@@ -246,8 +247,8 @@ of the enum-name name, separator-string, and field-name"
     (locally
      (declare (optimize (speed 3) (safety 0)))
      (let ((result (make-array len :element-type '(unsigned-byte 8))))
-       (funcall *system-copy-fn* sap 0 result *system-copy-offset*
-               (* len *system-copy-multiplier*))
+       (funcall *system-copy-fn* sap 0 result +system-copy-offset+
+               (* len +system-copy-multiplier+))
        result))))
 
 #+cmu