From e808a7bbbdb701b208c9e7f2cc75151a847ff3af Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 23 Jan 2005 00:28:49 +0000 Subject: [PATCH] r10271: support sbcl-amd64 --- ChangeLog | 3 +++ debian/changelog | 6 ++++++ src/primitives.lisp | 6 ++++-- tests/foreign-loader.lisp | 4 ++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74557be..c8d7c69 100644 --- 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 1c25bbb..14ec424 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-uffi (1.4.31-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg 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 02348a3..0878026 100644 --- 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 49eb103..cebbeae 100644 --- 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/")) -- 2.34.1