X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fprimitives.lisp;h=6eafe7ffcd68a83b1c48641802f36fbc8bab0e33;hb=3ade95bab16abe09642554e9cbf56f117f01e507;hp=5522f5a73e55e79f4baea4a7d0e844d46357d53b;hpb=13635ed2b774e454b90823e085d84aa968da9eb4;p=uffi.git

diff --git a/src/primitives.lisp b/src/primitives.lisp
index 5522f5a..6eafe7f 100644
--- a/src/primitives.lisp
+++ b/src/primitives.lisp
@@ -9,11 +9,8 @@
 ;;;;
 ;;;; $Id$
 ;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg
 ;;;;
-;;;; UFFI users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
 (in-package #:uffi)
@@ -97,8 +94,10 @@ supports takes advantage of this optimization."
       (:unsigned-short . (alien:unsigned 16))
       (:int . (alien:signed 32))
       (:unsigned-int . (alien:unsigned 32))
-      (:long . (alien:signed 32))
-      (:unsigned-long . (alien:unsigned 32))
+      #-x86-64 (:long . (alien:signed 32))
+      #-x86-64 (:unsigned-long . (alien:unsigned 32))
+      #+x86-64 (:long . (alien:signed 64))
+      #+x86-64 (:unsigned-long . (alien:unsigned 64))
       (:float . alien:single-float)
       (:double . alien:double-float)
       (:void . t)
@@ -272,9 +271,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)))