r10271: support sbcl-amd64

diff --git a/ChangeLog b/ChangeLog
index 74557bec858cd3697b2a6455f6cd7a42cdf80706..c8d7c694268be457ca5598dc68a932375164881a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2005-01-22 Kevin Rosenberg (kevin@rosenberg.net)
+       * src/primitives.lisp: Better support SBCL-AMD64
+       
 2004-11-08 Kevin Rosenberg (kevin@rosenberg.net)
        * src/strings.lisp: Better support sb-unicode
        * tests/compress.lisp: Support sb-unicode

diff --git a/debian/changelog b/debian/changelog
index 1c25bbb33387ce4257e5ae29c6003e26c4795566..14ec424535fdb6151a6c30a7604aa279005eced0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-uffi (1.4.31-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 22 Jan 2005 17:27:37 -0700
+
 cl-uffi (1.4.30-1) unstable; urgency=low
 
   * New upstream, handle sb-unicode

diff --git a/src/primitives.lisp b/src/primitives.lisp
index 02348a3bc1edaa3a74cc8f6f6d5aebef939c420d..087802648e052cd65e70796a5251ef93f0980c5f 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)

diff --git a/tests/foreign-loader.lisp b/tests/foreign-loader.lisp
index 49eb10399ea6fd87d8a1da7caccbd9c1e95e8ef6..cebbeaefaebe640e34dbef91b1078daa181f9e63 100644 (file)
--- a/tests/foreign-loader.lisp
+++ b/tests/foreign-loader.lisp
@@ -25,7 +25,7 @@
          #+(or macosx darwin)
          "z"
          (list (pathname-directory *load-pathname*)
-               "/usr/local/lib/" #+64bit "/usr/lib64/"
+               "/usr/local/lib/" #+(or 64bit x86-64) "/usr/lib64/"
                "/usr/lib/" "/zlib/"))
         :module "zlib" 
         :supporting-libraries '("c"))
@@ -33,7 +33,7 @@
   
 (unless (uffi:load-foreign-library 
         (uffi:find-foreign-library
-         "uffi-c-test" 
+         '(#+(or 64bit x86-64) "uffi-c-test64" "uffi-c-test") 
          (list (pathname-directory *load-truename*)
                "/usr/lib/uffi/"
                "/home/kevin/debian/src/uffi/tests/"))