r3428: openmcl fixes

diff --git a/examples/c-test-fns.lisp b/examples/c-test-fns.lisp
index 84c2161275bd5fddf20144a64549d5995c9487fb..4ff8fb90ea24632fd6b0240349418dad6a8f7908 100644 (file)
--- a/examples/c-test-fns.lisp
+++ b/examples/c-test-fns.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: c-test-fns.lisp,v 1.3 2002/10/23 18:03:21 kevin Exp $
+;;;; $Id: c-test-fns.lisp,v 1.4 2002/11/18 04:53:31 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -21,8 +21,7 @@
 (unless (uffi:load-foreign-library 
         (uffi:find-foreign-library "c-test-fns" 
                                    (list *load-truename* "/home/kevin/debian/src/uffi/examples/"))
-        :supporting-libraries '("c")
-        :force-load t)
+        :supporting-libraries '("c"))
   (warn "Unable to load c-test-fns library"))
 
 (uffi:def-function ("cs_to_upper" cs-to-upper)

diff --git a/src/libraries.lisp b/src/libraries.lisp
index c259dc8d08b69ba206e0c71bd0d25ded426c71a8..f922b668d5ec22e4850f8ab5940b6fd9fdeefd5e 100644 (file)
--- 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.4 2002/10/16 11:56:43 kevin Exp $
+;;;; $Id: libraries.lisp,v 1.5 2002/11/18 04:53:32 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -25,8 +25,8 @@
 (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) "dylib"
+  #-(or win32 mswindows macosx darwin) "so"
 )
 
 (defun find-foreign-library (names directories &key types drive-letters)  

diff --git a/tests/c-test-fns.lisp b/tests/c-test-fns.lisp
index 84c2161275bd5fddf20144a64549d5995c9487fb..4ff8fb90ea24632fd6b0240349418dad6a8f7908 100644 (file)
--- a/tests/c-test-fns.lisp
+++ b/tests/c-test-fns.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: c-test-fns.lisp,v 1.3 2002/10/23 18:03:21 kevin Exp $
+;;;; $Id: c-test-fns.lisp,v 1.4 2002/11/18 04:53:31 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -21,8 +21,7 @@
 (unless (uffi:load-foreign-library 
         (uffi:find-foreign-library "c-test-fns" 
                                    (list *load-truename* "/home/kevin/debian/src/uffi/examples/"))
-        :supporting-libraries '("c")
-        :force-load t)
+        :supporting-libraries '("c"))
   (warn "Unable to load c-test-fns library"))
 
 (uffi:def-function ("cs_to_upper" cs-to-upper)