Quarks simplified

[clg] / glib / ffi.lisp

diff --git a/glib/ffi.lisp b/glib/ffi.lisp
index 86d0045d0839d59c03df201d4c74ab6f38f6513a..64ec4fc078c651518bc23ab37c3570e4f8f07e1f 100644 (file)
--- 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))))