From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Thu, 6 May 2004 16:14:22 +0000 (+0000)
Subject: r9264: fix for deref-array for openmcl
X-Git-Tag: v1.6.1~114
X-Git-Url: http://git.kpe.io/?p=uffi.git;a=commitdiff_plain;h=ac201b76eda15e3da7f31369e9eaf6d0a349163a

r9264: fix for deref-array for openmcl
---

diff --git a/debian/changelog b/debian/changelog
index 6c502e6..5daf2e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-uffi (1.4.13-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu,  6 May 2004 10:14:10 -0600
+
 cl-uffi (1.4.12-1) unstable; urgency=low
 
   * New upstream
diff --git a/src/aggregates.lisp b/src/aggregates.lisp
index 3fcb410..523bd4f 100644
--- a/src/aggregates.lisp
+++ b/src/aggregates.lisp
@@ -164,17 +164,26 @@ of the enum-name name, separator-string, and field-name"
   #+sbcl  `(sb-alien:deref ,obj ,i)
   #+lispworks `(fli:dereference ,obj :index ,i :copy-foreign-object nil)
   #+allegro `(ff:fslot-value-typed (quote ,(convert-from-uffi-type type :type)) :c ,obj ,i)
-  #+mcl
+  #+openmcl
   (let* ((array-type (array-type type))
          (local-type (convert-from-uffi-type array-type :allocation))
-         (accessor (first (macroexpand `(ccl:pref obj ,local-type)))))
-    `(,accessor 
+	 (element-size-in-bits (ccl::%foreign-type-or-record-size local-type :bits)))
+    (ccl::%foreign-access-form
+     obj
+     (ccl::%foreign-type-or-record local-type)
+     `(* ,i ,element-size-in-bits)
+     nil))
+  #+(and mcl (not openmcl))
+  (let* ((array-type (array-type type))
+	 (local-type (convert-from-uffi-type array-type :allocation))
+	 (accessor (first (macroexpand `(ccl:pref obj ,local-type)))))
+    `(,accessor
       ,obj
       (* (the fixnum ,i) ,(size-of-foreign-type local-type))))
   )
 
 ; this expands to the %set-xx functions which has different params than %put-xx
-#+mcl
+#+(and mcl (not openmcl))
 (defmacro deref-array-set (obj type i value)
   (let* ((array-type (array-type type))
          (local-type (convert-from-uffi-type array-type :allocation))
@@ -185,7 +194,7 @@ of the enum-name name, separator-string, and field-name"
       (* (the fixnum ,i) ,(size-of-foreign-type local-type)) 
       ,value)))
 
-#+mcl
+#+(and mcl (not openmcl))
 (defsetf deref-array deref-array-set)
 
 (defmacro def-union (name &rest fields)