r10106: Automated commit for Debian build of uffi upstream-version-1.4.28

[uffi.git] / src / objects.lisp

diff --git a/src/objects.lisp b/src/objects.lisp
index 6ec32234aaa87792332dc39ebc2bb0a4c65784ed..358763e41fc829c815845886a3e898dcf31bd733 100644 (file)
--- a/src/objects.lisp
+++ b/src/objects.lisp
@@ -51,21 +51,9 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
        )
       (progn
        #+(or cmu scl)
-       (if (integerp size)
-           `(alien:cast
-             (alien:make-alien ,(convert-from-uffi-type (eval type) :allocation) ,size)
-             (array ,(convert-from-uffi-type (eval type) :allocation) ,size))
-           `(alien:cast
-             (alien:make-alien ,(convert-from-uffi-type (eval type) :allocation) ,size)
-             (array ,(convert-from-uffi-type (eval type) :allocation) nil)))
+       `(alien:make-alien ,(convert-from-uffi-type (eval type) :allocation) ,size)
        #+sbcl
-       (if (integerp size)
-           `(sb-alien:cast
-             (sb-alien:make-alien ,(convert-from-uffi-type (eval type) :allocation) ,size)
-             (array ,(convert-from-uffi-type (eval type) :allocation) ,size))
-           `(sb-alien:cast
-             (sb-alien:make-alien ,(convert-from-uffi-type (eval type) :allocation) ,size)
-             (array ,(convert-from-uffi-type (eval type) :allocation) nil)))
+       `(sb-alien:make-alien ,(convert-from-uffi-type (eval type) :allocation) ,size)
        #+lispworks
        `(fli:allocate-foreign-object :type ',(convert-from-uffi-type type :allocate) :nelems ,size)
        #+allegro
@@ -133,11 +121,11 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   #+mcl `(ccl:pref ,ptr ,(convert-from-uffi-type type :deref))
   )
 
-#+mcl
+#+(and mcl (not openmcl))
 (defmacro deref-pointer-set (ptr type value)
   `(setf (ccl:pref ,ptr ,(convert-from-uffi-type type :deref)) ,value))
 
-#+mcl
+#+(and mcl (not openmcl))
 (defsetf deref-pointer deref-pointer-set)
 
 (defmacro ensure-char-character (obj)
@@ -178,10 +166,15 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
         (progn ,@body)
       (free-foreign-object ,var)))
   #+(or cmu scl)
-  (let ((obj (gensym)))
-    `(alien:with-alien ((,obj ,(convert-from-uffi-type (eval type) :allocate)))
-       (let ((,var (alien:addr ,obj)))
-        ,@body)))
+  (let ((obj (gensym))
+       (ctype (convert-from-uffi-type (eval type) :allocate)))
+    (if (and (consp ctype) (eq 'array (car ctype)))
+       `(alien:with-alien ((,obj ,ctype))
+         (let* ((,var ,obj))
+           ,@body))
+       `(alien:with-alien ((,obj ,ctype))
+         (let* ((,var (alien:addr ,obj)))
+           ,@body))))
   #+sbcl
   (let ((obj (gensym))
        (ctype (convert-from-uffi-type (eval type) :allocate)))