(:unsigned-short . (sb-alien:unsigned 16))
(:int . (sb-alien:signed 32))
(:unsigned-int . (sb-alien:unsigned 32))
- (:long . (sb-alien:signed 32))
- (:unsigned-long . (sb-alien:unsigned 32))
+ #-x86-64 (:long . (sb-alien:signed 32))
+ #-x86-64 (:unsigned-long . (sb-alien:unsigned 32))
+ #+x86-64 (:long . (sb-alien:signed 64))
+ #+x86-64 (:unsigned-long . (sb-alien:unsigned 64))
(:float . sb-alien:single-float)
(:double . sb-alien:double-float)
(:void . t)
(setq *type-conversion-list*
'((* . *) (:void . sb-alien:void)
(:pointer-void . (* t))
- (:cstring . sb-alien:c-string)
+ #-sb-unicode(:cstring . sb-alien:c-string)
+ #+sb-unicode(:cstring . sb-alien:utf8-string)
(:char . sb-alien:char)
(:unsigned-char . (sb-alien:unsigned 8))
(:byte . (sb-alien:signed 8))
(:unsigned-byte . (sb-alien:unsigned 8))
(:short . sb-alien:short)
(:unsigned-short . sb-alien:unsigned-short)
- (:int . sb-alien:integer) (:unsigned-int . sb-alien:unsigned-int)
+ (:int . sb-alien:int) (:unsigned-int . sb-alien:unsigned-int)
(:long . sb-alien:long) (:unsigned-long . sb-alien:unsigned-long)
(:float . sb-alien:float) (:double . sb-alien:double)
(:array . sb-alien:array)))
#+mcl `(:struct ,(%convert-from-uffi-type (cadr type) :struct))
#-mcl (%convert-from-uffi-type (cadr type) :struct)
)
- (t
- (cons (%convert-from-uffi-type (first type) context)
- (%convert-from-uffi-type (rest type) context)))))))
+ (:union
+ #+mcl `(:union ,(%convert-from-uffi-type (cadr type) :union))
+ #-mcl (%convert-from-uffi-type (cadr type) :union)
+ )
+ (t
+ (cons (%convert-from-uffi-type (first type) context)
+ (%convert-from-uffi-type (rest type) context)))))))
(defun convert-from-uffi-type (type context)
(let ((result (%convert-from-uffi-type type context)))
(cond
((atom result) result)
- ;; Arrays without size are really pointers to type on SBCL/CMUCL
- #+sbcl
- ((and (consp type) (= 2 (length type)) (eq :array (car type)))
- (setf (car result) 'sb-alien:*)
- result)
- #+cmu
- ((and (consp type) (= 2 (length type)) (eq :array (car type)))
- (setf (car result) 'alien:*)
- result)
#+openmcl
((eq (car result) :address)
(if (eq context :struct)
(eval-when (:compile-toplevel :load-toplevel :execute)
(when (char= #\a (schar (symbol-name '#:a) 0))
(pushnew :uffi-lowercase-reader *features*))
- (when (not (string-equal (symbol-name '#:a)
- (symbol-name '#:A)))
+ (when (not (string= (symbol-name '#:a)
+ (symbol-name '#:A)))
(pushnew :uffi-case-sensitive *features*)))
(defun make-lisp-name (name)