r10344: 2005-02-22 Kevin Rosenberg (kevin@rosenberg.net)

[uffi.git] / src / primitives.lisp

diff --git a/src/primitives.lisp b/src/primitives.lisp
index fbfc120c2d732625e8f7e820ed14ea3d0652628f..5522f5a73e55e79f4baea4a7d0e844d46357d53b 100644 (file)
--- a/src/primitives.lisp
+++ b/src/primitives.lisp
@@ -115,8 +115,10 @@ supports takes advantage of this optimization."
       (: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)
@@ -145,14 +147,15 @@ 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))
       (: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)))
@@ -277,15 +280,6 @@ supports takes advantage of this optimization."
   (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)