X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Faggregates.lisp;h=6be523ddd2b1760c6aca585b8f3fc44d242aed9c;hb=6229dcb7d816d344069abee0d103ef09c8e52c0e;hp=aff8f7740dcbf502106fc465c08a31e29e874361;hpb=2164fc8537ae2b53fdca3f5b401242299bd53c56;p=uffi.git

diff --git a/src/aggregates.lisp b/src/aggregates.lisp
index aff8f77..6be523d 100644
--- a/src/aggregates.lisp
+++ b/src/aggregates.lisp
@@ -227,25 +227,30 @@ 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 (sap len)
-  (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 (sap len)
-  (declare (type system:system-area-pointer sap))
-  (locally
-      (declare (optimize (speed 3) (safety 0)))
-    (let ((result (make-array len :element-type '(unsigned-byte 8))))
-      (kernel:copy-from-system-area sap 0
-				    result (* vm:vector-data-offset
-					      vm:word-bits)
-				    (* len vm:byte-bits))
-      result)))
+(defun convert-from-foreign-usb8 (s len)
+  (let ((sap (alien:alien-sap s)))
+    (declare (type system:system-area-pointer sap))
+    (locally
+	(declare (optimize (speed 3) (safety 0)))
+      (let ((result (make-array len :element-type '(unsigned-byte 8))))
+	(kernel:copy-from-system-area sap 0
+				      result (* vm:vector-data-offset
+						vm:word-bits)
+				      (* len vm:byte-bits))
+	result))))