X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fprimitives.lisp;h=b7c0283b2e2a9f6d9ba0fdf729b634aa738c09d6;hb=4b3d6378e1c9ea38fa2eeced4f9f2dfbe41e3a64;hp=50023b354919a1932ae1e06d07efcd29f4cbe89a;hpb=e0f5a9b35708481bb640718f8ecd837cf4ae69f5;p=uffi.git

diff --git a/src/primitives.lisp b/src/primitives.lisp
index 50023b3..b7c0283 100644
--- a/src/primitives.lisp
+++ b/src/primitives.lisp
@@ -7,9 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
 ;;;;
 ;;;; *************************************************************************
 
@@ -143,7 +141,13 @@ supports takes advantage of this optimization."
       (:unsigned-short . c-call:unsigned-short)
       (:int . alien:integer) (:unsigned-int . c-call:unsigned-int)
       (:long . c-call:long) (:unsigned-long . c-call:unsigned-long)
+      #+#.(cl:if (cl:find-symbol (cl:string '#:long-long)
+                                 (cl:string '#:c-call))
+                 '(and) '(or))
       (:long-long . c-call:long-long)
+      #+#.(cl:if (cl:find-symbol (cl:string '#:unsigned-long-long)
+                                 (cl:string '#:c-call))
+                 '(and) '(or))
       (:unsigned-long-long . c-call:unsigned-long-long)
       (:float . c-call:float) (:double . c-call:double)
       (:array . alien:array)))
@@ -183,7 +187,7 @@ supports takes advantage of this optimization."
       (:array . :array)))
 
 #+(or allegro cormanlisp)
-(push 'uffi:no-long-long cl:*features)
+(push 'uffi:no-long-long cl:*features*)
 
 #+lispworks
 (setq *type-conversion-list*
@@ -208,7 +212,7 @@ supports takes advantage of this optimization."
       (:array . :c-array)))
 
 #+(and lispworks (not lispworks6))
-(push 'uffi:no-long-long cl:*features)
+(push 'uffi:no-long-long cl:*features*)
 
 #+digitool
 (setq *type-conversion-list*
@@ -224,7 +228,7 @@ supports takes advantage of this optimization."
        (:float . :single-float) (:double . :double-float)
        (:array . :array)))
 #+digitool
-(push 'uffi:no-long-long cl:*features)
+(push 'uffi:no-long-long cl:*features*)
 
 #+openmcl
 (setq *type-conversion-list*