Bug fix

diff --git a/glib/genums.lisp b/glib/genums.lisp
index c6ade3678db5ed5d5c0ac9c6f09d98a7de16d1bf..5ef97530fe6c977fe13426d2163d55e08c48adec 100644 (file)
--- a/glib/genums.lisp
+++ b/glib/genums.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
 
 ;; 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: genums.lisp,v 1.6 2005/02/01 15:24:52 espen Exp $
+;; $Id: genums.lisp,v 1.7 2005/02/03 22:59:35 espen Exp $

 
 (in-package "GLIB")
 
 
 (in-package "GLIB")
 


@@ -156,7 +156,7 @@ (defmethod from-alien-form (int (type (eql 'flags)) &rest args)
   (declare (ignore type))
   `(loop
     for mapping in ',(%map-enum args :int-flags)
   (declare (ignore type))
   `(loop
     for mapping in ',(%map-enum args :int-flags)

-    unless (zerop (logand int (first mapping)))
+    unless (zerop (logand ,int (first mapping)))

     collect (second mapping)))
 
 (defmethod to-alien-function ((type (eql 'flags)) &rest args)
     collect (second mapping)))
 
 (defmethod to-alien-function ((type (eql 'flags)) &rest args)


@@ -214,7 +214,7 @@ (defun query-flags-values (type)
 ;;;;
 
 (defun expand-enum-type (type-number forward-p options)
 ;;;;
 
 (defun expand-enum-type (type-number forward-p options)

-  (declare (ignore forward))
+  (declare (ignore forward-p))

   (let* ((super (supertype type-number))
         (type (type-from-number type-number))
         (mappings (getf options :mappings))
   (let* ((super (supertype type-number))
         (type (type-from-number type-number))
         (mappings (getf options :mappings))