X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.lisp;h=59b5907c622b96c3a31974ce793cbc621810a5bf;hb=093110cc904383694a1b549cf3525cc7088e92e1;hp=349df7eb5d9371628e7db388ae3e5837b26081ba;hpb=79ae1e2eea28653ceee96460004c5381931c5af8;p=uffi.git

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 349df7e..59b5907 100644
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -20,9 +20,9 @@
 
 (defun default-foreign-library-type ()
   "Returns string naming default library type for platform"
-  #+(or win32 mswindows) "dll"
+  #+(or win32 cygwin mswindows) "dll"
   #+(or macosx darwin ccl-5.0) "dylib"
-  #-(or win32 mswindows macosx darwin ccl-5.0) "so"
+  #-(or win32 cygwin mswindows macosx darwin ccl-5.0) "so"
 )
 
 (defun foreign-library-types ()
@@ -80,23 +80,27 @@ library type if type is not specified."
   #+(or cmu scl) (declare (ignore module))
   #+lispworks (declare (ignore supporting-libraries))
 
-  (when (and filename (or (null (pathname-directory filename))
-                          (probe-file filename)))
-    (if (pathnamep filename)    ;; ensure filename is a string to check if already loaded
-	(setq filename (namestring (if (null (pathname-directory filename))
-				       filename
-				       ;; lispworks treats as UNC, so use truename
-				       #+(and lispworks win32) (truename filename)
-				       #-(and lispworks win32) filename))))
+  (flet ((load-failure ()
+           (error "Unable to load foreign library \"~A\"." filename)))
+    (when (and filename (or (null (pathname-directory filename))
+                            (probe-file filename)))
+      (if (pathnamep filename)    ;; ensure filename is a string to check if already loaded
+          (setq filename (namestring (if (null (pathname-directory filename))
+                                         filename
+                                         ;; lispworks treats as UNC, so use truename
+                                         #+(and lispworks win32) (truename filename)
+                                         #-(and lispworks win32) filename))))
 
-    (if (and (not force-load)
-	     (find filename *loaded-libraries* :test #'string-equal))
-	t ;; return T, but don't reload library
+      (if (and (not force-load)
+               (find filename *loaded-libraries* :test #'string-equal))
+          t ;; return T, but don't reload library
       (progn
 	#+cmu
 	(let ((type (pathname-type (parse-namestring filename))))
 	  (if (string-equal type "so")
-	      (sys::load-object-file filename)
+	      (unless
+                  (sys::load-object-file filename)
+                (load-failure))
 	      (alien:load-foreign filename
 				  :libraries
 				  (convert-supporting-libraries-to-string
@@ -115,13 +119,13 @@ library type if type is not specified."
 		(error c))))
 
 	#+lispworks (fli:register-module module :real-name filename
-                                                :connection-style :immediate)
+                                         :connection-style :immediate)
 	#+allegro (load filename)
 	#+openmcl (ccl:open-shared-library filename)
 	#+digitool (ccl:add-to-shared-library-search-path filename t)
 
 	(push filename *loaded-libraries*)
-	t))))
+	t)))))
 
 (defun convert-supporting-libraries-to-string (libs)
   (let (lib-load-list)