X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.cl;h=29320469a59c7a56352c2c58fcf04d9bdb2c46e9;hb=46fbc92bfdcb2504d863929bde42962275e80e74;hp=05ca12556071a3a77dd83fdba2a6555fcd76143b;hpb=8439e722b78d26a4ae9b290373acb71920af2262;p=uffi.git

diff --git a/src/libraries.cl b/src/libraries.cl
index 05ca125..2932046 100644
--- a/src/libraries.cl
+++ b/src/libraries.cl
@@ -1,4 +1,4 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10; Package: UFFI -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.cl,v 1.12 2002/04/03 17:43:31 kevin Exp $
+;;;; $Id: libraries.cl,v 1.14 2002/04/06 19:53:08 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -83,14 +83,16 @@ library type if type is not specified."
 	     (find filename *loaded-libraries* :test #'string-equal))
 	t ;; return T, but don't reload library
       (progn
-	#+(and ignore cmu) (alien:load-foreign filename 
+	#+cmu
+	(let ((type (pathname-type (parse-namestring filename))))
+	  (if (equal type "so")
+	      (sys::load-object-file filename)
+	      (alien:load-foreign filename 
 				  :libraries
 				  (convert-supporting-libraries-to-string
-				   supporting-libraries))
-	#+cmu (sys::load-object-file filename) 
-
+				   supporting-libraries))))
+	
 	#+lispworks (fli:register-module module 
-					 :connection-style :automatic 
 					 :real-name filename)
 	#+allegro (load filename)