From c1f5fa10b352b00c916dcf388be5ad1f49240a2c Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 8 Jul 2003 12:37:21 +0000 Subject: [PATCH 1/1] r5255: *** empty log message *** --- src/libraries.lisp | 15 ++++++++------- src/objects.lisp | 7 +------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/libraries.lisp b/src/libraries.lisp index 65f9f57..ff14928 100644 --- a/src/libraries.lisp +++ b/src/libraries.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: libraries.lisp,v 1.8 2003/06/26 18:02:08 kevin Exp $ +;;;; $Id: libraries.lisp,v 1.9 2003/07/08 12:37:21 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -98,12 +98,13 @@ library type if type is not specified." (convert-supporting-libraries-to-string supporting-libraries))) #+sbcl - (if (string-equal type "so") - (sb-alien::load-1-foreign filename) - (sb-alien:load-foreign filename - :libraries - (convert-supporting-libraries-to-string - supporting-libraries))) + (let ((type (pathname-type (parse-namestring filename)))) + (if (string-equal type "so") + (sb-alien::load-1-foreign filename) + (sb-alien:load-foreign filename + :libraries + (convert-supporting-libraries-to-string + supporting-libraries)))) #+lispworks (fli:register-module module :real-name filename) #+allegro (load filename) #+openmcl (ccl:open-shared-library filename) diff --git a/src/objects.lisp b/src/objects.lisp index 2efacf1..4930962 100644 --- a/src/objects.lisp +++ b/src/objects.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: objects.lisp,v 1.14 2003/06/26 18:02:08 kevin Exp $ +;;;; $Id: objects.lisp,v 1.15 2003/07/08 12:37:21 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -134,11 +134,6 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated." (defmacro ensure-char-integer (obj) obj) -;; Returns the numeric value of a byte at a pointer -;; Highly optimized -(defmacro byte-value-at-pointer (ptr) - ) - (defmacro pointer-address (obj) #+(or cmu scl) `(system:sap-int (alien:alien-sap ,obj)) -- 2.34.1