uffi/src functions.lisp,1.5,1.6 libraries.lisp,1.5,1.6

"Kevin M. Rosenberg" <[email protected]> Wed, 20 Nov 2002 14:01:33 -0700
Newsgroups gmane.lisp.uffi.cvs
Message-ID <[email protected]>
Update of /pubcvs/uffi/src
In directory boa.b9.com:/tmp/cvs-serv3330/src

Modified Files:
	functions.lisp libraries.lisp 
Log Message:
mcl/openmcl fixes


Index: functions.lisp
===================================================================
RCS file: /pubcvs/uffi/src/functions.lisp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** functions.lisp	16 Oct 2002 11:56:43 -0000	1.5
--- functions.lisp	20 Nov 2002 21:01:31 -0000	1.6
***************
*** 24,28 ****
        #+(or lispworks cmu sbcl scl cormanlisp (and mcl (not openmcl))) nil
        #+allegro '(:void)
!       #+mcl (values nil nil)
  
        ;; args not null
--- 24,28 ----
        #+(or lispworks cmu sbcl scl cormanlisp (and mcl (not openmcl))) nil
        #+allegro '(:void)
!       #+openmcl (values nil nil)
  
        ;; args not null
***************
*** 34,47 ****
        #+openmcl
        (let ((processed nil)
! 	    (params nil)
! 	    name type)
  	(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))
  	(values (nreverse params) (nreverse processed)))
      ))
--- 34,46 ----
        #+openmcl
        (let ((processed nil)
! 	    (params nil))
  	(dolist (arg args)
! 	  (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)))
      ))
***************
*** 56,59 ****
--- 55,60 ----
  	(append (list name) type)
        (list name type))
+     #+openmcl
+     (declare (ignore name type))
      ))    
  
***************
*** 100,103 ****
--- 101,106 ----
           ,function-args
           ,result-type))
+     #+openmcl
+     (declare (ignore function-args))
      #+(and openmcl darwinppc-target)
      (setf foreign-name (concatenate 'string "_" foreign-name))

Index: libraries.lisp
===================================================================
RCS file: /pubcvs/uffi/src/libraries.lisp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** libraries.lisp	18 Nov 2002 04:53:32 -0000	1.5
--- libraries.lisp	20 Nov 2002 21:01:31 -0000	1.6
***************
*** 26,31 ****
    "Returns string naming default library type for platform"
    #+(or win32 mswindows) "dll"
!   #+(or macosx darwin) "dylib"
!   #-(or win32 mswindows macosx darwin) "so"
  )
  
--- 26,31 ----
    "Returns string naming default library type for platform"
    #+(or win32 mswindows) "dll"
!   #+(or macosx darwin ccl-5.0) "dylib"
!   #-(or win32 mswindows macosx darwin ccl-5.0) "so"
  )
  
***************
*** 74,78 ****
  (defun load-foreign-library (filename &key module supporting-libraries
  					   force-load)
!   #+(or allegro lispworks openmcl) (declare (ignore module supporting-libraries))
    #+(or cmu scl sbcl) (declare (ignore module))
    
--- 74,78 ----
  (defun load-foreign-library (filename &key module supporting-libraries
  					   force-load)
!   #+(or allegro lispworks mcl) (declare (ignore module supporting-libraries))
    #+(or cmu scl sbcl) (declare (ignore module))