From 6f7ce2ee216d141886f43ce07befd0c2668bcefb Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 13 Jul 2004 15:53:22 +0000 Subject: [PATCH] r9767: Automated commit for Debian build of uffi upstream-version-1.4.23 --- debian/changelog | 6 ++++++ src/libraries.lisp | 15 ++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4491b29..c80c1a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-uffi (1.4.23-1) unstable; urgency=low + + * Add support for new SBCL load-shared-object [supplied by Andreas Fuchs] + + -- Kevin M. Rosenberg Tue, 13 Jul 2004 09:19:32 -0600 + cl-uffi (1.4.22-1) unstable; urgency=low * OpenMCL fix diff --git a/src/libraries.lisp b/src/libraries.lisp index 8fa6612..942f764 100644 --- a/src/libraries.lisp +++ b/src/libraries.lisp @@ -105,15 +105,12 @@ library type if type is not specified." (convert-supporting-libraries-to-string supporting-libraries))) #+sbcl - (let ((type (pathname-type (parse-namestring filename)))) - (if (or (string-equal type "so") - (string-equal type "bundle") - (string-equal type "dylib")) - (sb-alien::load-1-foreign filename) - (sb-alien:load-foreign filename - :libraries - (convert-supporting-libraries-to-string - supporting-libraries)))) + (handler-case (sb-alien::load-1-foreign filename) + (sb-int:unsupported-operator (c) + (if (fboundp (intern "LOAD-SHARED-OBJECT" :sb-alien)) + (funcall (intern "LOAD-SHARED-OBJECT" :sb-alien) filename) + (error c)))) + #+lispworks (fli:register-module module :real-name filename) #+allegro (load filename) #+openmcl (ccl:open-shared-library filename) -- 2.34.1