X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=uffi%2Fclsql-uffi-loader.lisp;h=d549ccb95ca69b44a2b27fc1dcdc78714961ede0;hp=115209a9afda21a8de6af86f1c5b64be06fc7c98;hb=eabede9da3e61ef5191b601dcf9b30f30f613f3e;hpb=e44d25095946bbc8b5d175a09dc2e611eee319e7

diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp
index 115209a..d549ccb 100644
--- a/uffi/clsql-uffi-loader.lisp
+++ b/uffi/clsql-uffi-loader.lisp
@@ -7,9 +7,7 @@
 ;;;; Author:   Kevin M. Rosenberg
 ;;;; Created:  Mar 2002
 ;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@ -24,24 +22,24 @@ well as any of the filenames in any of the clsql:*foreign-library-search-paths*"
   (setq filenames (if (listp filenames) filenames (list filenames)))
 
   (flet ((try-load (testpath)
-	   (handler-case
-	       (uffi:load-foreign-library testpath
-					  :module module
-					  :supporting-libraries supporting-libraries)
-	     (error (c) (warn "~A" c) nil))))
+           (handler-case
+               (uffi:load-foreign-library testpath
+                                          :module module
+                                          :supporting-libraries supporting-libraries)
+             (error nil)))) ;(c) (warn "~A" c) nil))))
     (or
      (loop for type in (uffi:foreign-library-types)
-	   thereis
-	   (loop for name in filenames
-		 for pn = (make-pathname :name name :type type)
-		 thereis (or
-			  (loop for search-path in clsql:*foreign-library-search-paths*
-				thereis (try-load (merge-pathnames pn search-path)))
-			  (try-load pn))))
+           thereis
+           (loop for name in filenames
+                 for pn = (make-pathname :name name :type type)
+                 thereis (or
+                          (try-load pn)
+                          (loop for search-path in clsql:*foreign-library-search-paths*
+                                thereis (try-load (merge-pathnames pn search-path))))))
      (when errorp
        (error "Couldn't load foreign librar~@P ~{~S~^, ~}. (searched ~S)"
-	      (length filenames) filenames
-	      'clsql:*foreign-library-search-paths*)))))
+              (length filenames) filenames
+              'clsql:*foreign-library-search-paths*)))))
 
 ;; searches clsql_uffi64 to accomodate both 32-bit and 64-bit libraries on same system
 (defvar *clsql-uffi-library-filenames*
@@ -56,12 +54,12 @@ set to the right path before compiling or loading the system.")
 (defvar *uffi-library-loaded* nil
   "T if foreign library was able to be loaded successfully")
 
-(defun load-uffi-foreign-library ()
-  (clsql:push-library-path clsql-uffi-system::*clsql-uffi-library-dir*)
-  (find-and-load-foreign-library *clsql-uffi-library-filenames*
-                                 :module "clsql-uffi"
-                                 :supporting-libraries
-                                 *clsql-uffi-supporting-libraries*)
-  (setq *uffi-library-loaded* t))
+;; (defun load-uffi-foreign-library ()
+;;   (clsql:push-library-path clsql-uffi-system::*clsql-uffi-library-dir*)
+;;   (find-and-load-foreign-library *clsql-uffi-library-filenames*
+;;                                  :module "clsql-uffi"
+;;                                  :supporting-libraries
+;;                                  *clsql-uffi-supporting-libraries*)
+;;   (setq *uffi-library-loaded* t))
 
-(load-uffi-foreign-library)
+;; (load-uffi-foreign-library)