r10378: preliminary new sbcl support

[uffi.git] / src / aggregates.lisp

diff --git a/src/aggregates.lisp b/src/aggregates.lisp
index c6624074dd2a07baeaa46bbad95da468bd32ef89..6be523ddd2b1760c6aca585b8f3fc44d242aed9c 100644 (file)
--- a/src/aggregates.lisp
+++ b/src/aggregates.lisp
@@ -227,17 +227,20 @@ of the enum-name name, separator-string, and field-name"
       (setf (aref a i) (uffi:deref-array s '(:array :unsigned-byte) i)))))
 
 #+sbcl
-(defun convert-from-foreign-usb8 (s len)
-  (let ((sap (sb-alien:alien-sap s)))
-    (declare (type sb-sys:system-area-pointer sap))
-    (locally
-       (declare (optimize (speed 3) (safety 0)))
-      (let ((result (make-array len :element-type '(unsigned-byte 8))))
-       (sb-kernel:copy-from-system-area sap 0
-                                        result (* sb-vm:vector-data-offset
-                                                  sb-vm:n-word-bits)
-                                        (* len sb-vm:n-byte-bits))
-       result))))
+(let ((copy-fn (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
+                  (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL")
+                  (intern "COPY-UB8-FROM-SYSTEM" "SB-KERNEL"))))
+  (defun convert-from-foreign-usb8 (s len)
+    (let ((sap (sb-alien:alien-sap s)))
+      (declare (type sb-sys:system-area-pointer sap))
+      (locally
+         (declare (optimize (speed 3) (safety 0)))
+       (let ((result (make-array len :element-type '(unsigned-byte 8))))
+         (funcall copy-fn sap 0
+                  result (* sb-vm:vector-data-offset
+                            sb-vm:n-word-bits)
+                  (* len sb-vm:n-byte-bits))
+         result)))))
 
 #+cmu
 (defun convert-from-foreign-usb8 (s len)