X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Ffunctions.lisp;h=ea87b2e3d8f112664463d8ec18052234b3e9ffea;hb=673f79a7d41d393c776f864a3c8a58640500b774;hp=f23ec8f6163de4f38f06083c5233ca952105a90b;hpb=caf4972e7f7d2562fe4a9977cf20d38bbf0e320f;p=uffi.git 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