projects
/
uffi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r5255: *** empty log message ***
[uffi.git]
/
src
/
libraries.lisp
diff --git
a/src/libraries.lisp
b/src/libraries.lisp
index c259dc8d08b69ba206e0c71bd0d25ded426c71a8..ff14928674c5cd4c438b3aed24b69eacfc69ed5d 100644
(file)
--- a/
src/libraries.lisp
+++ b/
src/libraries.lisp
@@
-2,12
+2,12
@@
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; Name: libraries.
cl
+;;;; Name: libraries.
lisp
;;;; Purpose: UFFI source to load foreign libraries
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
;;;; Purpose: UFFI source to load foreign libraries
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
-;;;; $Id: libraries.lisp,v 1.
4 2002/10/16 11:56:43
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
;;;;
;;;;
;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
@@
-16,8
+16,7
@@
;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :uffi)
+(in-package #:uffi)
(defvar *loaded-libraries* nil
"List of foreign libraries loaded. Used to prevent reloading a library")
(defvar *loaded-libraries* nil
"List of foreign libraries loaded. Used to prevent reloading a library")
@@
-25,8
+24,8
@@
(defun default-foreign-library-type ()
"Returns string naming default library type for platform"
#+(or win32 mswindows) "dll"
(defun default-foreign-library-type ()
"Returns string naming default library type for platform"
#+(or win32 mswindows) "dll"
- #+
macosx
"dylib"
- #-(or win32 mswindows macosx) "so"
+ #+
(or macosx darwin ccl-5.0)
"dylib"
+ #-(or win32 mswindows macosx
darwin ccl-5.0
) "so"
)
(defun find-foreign-library (names directories &key types drive-letters)
)
(defun find-foreign-library (names directories &key types drive-letters)
@@
-73,7
+72,7
@@
library type if type is not specified."
(defun load-foreign-library (filename &key module supporting-libraries
force-load)
(defun load-foreign-library (filename &key module supporting-libraries
force-load)
- #+(or allegro lispworks
open
mcl) (declare (ignore module supporting-libraries))
+ #+(or allegro lispworks mcl) (declare (ignore module supporting-libraries))
#+(or cmu scl sbcl) (declare (ignore module))
(when (and filename (probe-file filename))
#+(or cmu scl sbcl) (declare (ignore module))
(when (and filename (probe-file filename))
@@
-86,12
+85,12
@@
library type if type is not specified."
(progn
#+cmu
(let ((type (pathname-type (parse-namestring filename))))
(progn
#+cmu
(let ((type (pathname-type (parse-namestring filename))))
- (if (equal type "so")
+ (if (
string-
equal type "so")
(sys::load-object-file filename)
(sys::load-object-file filename)
- (alien:load-foreign filename
- :libraries
- (convert-supporting-libraries-to-string
- supporting-libraries))))
+
(alien:load-foreign filename
+
:libraries
+
(convert-supporting-libraries-to-string
+
supporting-libraries))))
#+scl
(let ((type (pathname-type (parse-namestring filename))))
(alien:load-foreign filename
#+scl
(let ((type (pathname-type (parse-namestring filename))))
(alien:load-foreign filename
@@
-99,10
+98,13
@@
library type if type is not specified."
(convert-supporting-libraries-to-string
supporting-libraries)))
#+sbcl
(convert-supporting-libraries-to-string
supporting-libraries)))
#+sbcl
- (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)
#+lispworks (fli:register-module module :real-name filename)
#+allegro (load filename)
#+openmcl (ccl:open-shared-library filename)