r10379: more sbcl fixes

[uffi.git] / src / primitives.lisp

diff --git a/src/primitives.lisp b/src/primitives.lisp
index 087802648e052cd65e70796a5251ef93f0980c5f..0f47eb70b2d104134d9d354d4ee193481f5fc0d8 100644 (file)
--- a/src/primitives.lisp
+++ b/src/primitives.lisp
@@ -147,7 +147,8 @@ supports takes advantage of this optimization."
 (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))
@@ -271,9 +272,13 @@ supports takes advantage of this optimization."
         #+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)))