From 2e9e6f820b5bf35bafb506d63e92866bfacac7e9 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Wed, 20 Nov 2002 21:01:31 +0000
Subject: [PATCH] r3445: mcl/openmcl fixes

---
 src/functions.lisp | 25 ++++++++++++++-----------
 src/libraries.lisp |  8 ++++----
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/functions.lisp b/src/functions.lisp
index f23ec8f..ea87b2e 100644
--- a/src/functions.lisp
+++ b/src/functions.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: functions.lisp,v 1.5 2002/10/16 11:56:43 kevin Exp $
+;;;; $Id: functions.lisp,v 1.6 2002/11/20 21:01:31 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,7 +23,7 @@
   (if (null args)
       #+(or lispworks cmu sbcl scl cormanlisp (and mcl (not openmcl))) nil
       #+allegro '(:void)
-      #+mcl (values nil nil)
+      #+openmcl (values nil nil)
 
       ;; args not null
       #+(or lispworks allegro cmu sbcl scl (and mcl (not openmcl)) cormanlisp)
@@ -33,16 +33,15 @@
 	(nreverse processed))
       #+openmcl
       (let ((processed nil)
-	    (params nil)
-	    name type)
+	    (params nil))
 	(dolist (arg args)
-	  (setf name (car arg))
-	  (setf type (convert-from-uffi-type (cadr arg) :routine))
-	  ;;(when (and (listp type) (eq (car type) :address))
-	  ;;(setf type :address))
-	  (push name params)
-	  (push type processed)
-	  (push name processed))
+	  (let ((name (car arg))
+		(type (convert-from-uffi-type (cadr arg) :routine)))
+	    ;;(when (and (listp type) (eq (car type) :address))
+	    ;;(setf type :address))
+	    (push name params)
+	    (push type processed)
+	    (push name processed)))
 	(values (nreverse params) (nreverse processed)))
     ))
 
@@ -55,6 +54,8 @@
     (if (and (listp type) (listp (car type)))
 	(append (list name) type)
       (list name type))
+    #+openmcl
+    (declare (ignore name type))
     ))    
 
 
@@ -99,6 +100,8 @@
        (ccl:define-entry-point (,lisp-name ,foreign-name)
          ,function-args
          ,result-type))
+    #+openmcl
+    (declare (ignore function-args))
     #+(and openmcl darwinppc-target)
     (setf foreign-name (concatenate 'string "_" foreign-name))
     #+openmcl
diff --git a/src/libraries.lisp b/src/libraries.lisp
index f922b66..56829a0 100644
--- 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.5 2002/11/18 04:53:32 kevin Exp $
+;;;; $Id: libraries.lisp,v 1.6 2002/11/20 21:01:31 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"
-  #+(or macosx darwin) "dylib"
-  #-(or win32 mswindows macosx darwin) "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)  
@@ -73,7 +73,7 @@ library type if type is not specified."
 
 (defun load-foreign-library (filename &key module supporting-libraries
 					   force-load)
-  #+(or allegro lispworks openmcl) (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))
-- 
2.34.1