X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/b6bf802c65107c8d25475da5b7e82b4fd1b5311a..3e033db99da9c20b14237e45d5d4f75f61104de4:/glib/ffi.lisp?ds=sidebyside diff --git a/glib/ffi.lisp b/glib/ffi.lisp index 86d0045..64ec4fc 100644 --- a/glib/ffi.lisp +++ b/glib/ffi.lisp @@ -15,7 +15,7 @@ ;; License along with this library; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -;; $Id: ffi.lisp,v 1.10 2004/12/26 11:40:14 espen Exp $ +;; $Id: ffi.lisp,v 1.12 2005/01/03 16:35:05 espen Exp $ (in-package "GLIB") @@ -103,11 +103,11 @@ (defmacro defbinding (name lambda-list return-type &rest docs/args) (not supplied-lambda-list) (namep expr) (member style '(:in :in-out :return))) (push expr lambda-list)) - (push - (list (if (namep expr) - (make-symbol (string expr)) - (gensym)) - expr (mklist type) style) args))))) + (push (list (cond + ((and (namep expr) (eq style :out)) expr) + ((namep expr) (make-symbol (string expr))) + ((gensym))) + expr (mklist type) style) args))))) (%defbinding c-name lisp-name (or supplied-lambda-list (nreverse lambda-list)) @@ -378,7 +378,7 @@ (defmethod reader-function ((type (eql 'signed-byte)) &rest args) (defmethod alien-type ((type (eql 'unsigned-byte)) &rest args) (destructuring-bind (&optional (size '*)) args (ecase size - (#.+bits-of-byte+ '(unsigned-byte 8)) + (#.+bits-of-byte+ '(unsigned #|-byte|# 8)) (#.+bits-of-short+ 'c-call:unsigned-short) ((* #.+bits-of-int+) 'c-call:unsigned-int) (#.+bits-of-long+ 'c-call:unsigned-long))))