Version 1.8.5: Fix long-long detection

[uffi.git] / src / primitives.lisp

diff --git a/src/primitives.lisp b/src/primitives.lisp
index b7c0283b2e2a9f6d9ba0fdf729b634aa738c09d6..a43eb8dd24e4c2ff1b615475be0cdd900113cfae 100644 (file)
--- a/src/primitives.lisp
+++ b/src/primitives.lisp
@@ -141,12 +141,14 @@ 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))
+      #+#.(cl:if (cl:and (cl:find-package (cl:string '#:c-call))
+                         (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))
+      #+#.(cl:if (cl:and (cl:find-package (cl:string '#:c-call))
+                         (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)