Mapped NIL type to "void"

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index e6850b6a56b7b1deb77342e6901b85ae6ddc230c..165c06e36faa49c09984c91b4af0b2e935a7c93d 100644 (file)
--- a/glib/gtype.lisp
+++ b/glib/gtype.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: gtype.lisp,v 1.22 2004-12-28 20:30:06 espen Exp $
+;; $Id: gtype.lisp,v 1.23 2005-01-12 13:33:06 espen Exp $

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


@@ -48,12 +48,12 @@ (defmethod to-alien-function ((type (eql 'gtype)) &rest args)
 
 (defmethod from-alien-form (type-number (type (eql 'gtype)) &rest args)
   (declare (ignore type args))
 
 (defmethod from-alien-form (type-number (type (eql 'gtype)) &rest args)
   (declare (ignore type args))

-  `(type-from-number ,type-number t)) 
+  `(type-from-number ,type-number)) 

 
 (defmethod from-alien-function ((type (eql 'gtype)) &rest args)
   (declare (ignore type args))
   #'(lambda (type-number)
 
 (defmethod from-alien-function ((type (eql 'gtype)) &rest args)
   (declare (ignore type args))
   #'(lambda (type-number)

-      (type-from-number type-number t)))
+      (type-from-number type-number)))

 
 (defmethod writer-function ((type (eql 'gtype)) &rest args)
   (declare (ignore type))
 
 (defmethod writer-function ((type (eql 'gtype)) &rest args)
   (declare (ignore type))


@@ -65,7 +65,7 @@ (defmethod reader-function ((type (eql 'gtype)) &rest args)
   (declare (ignore type))
   (let ((reader (reader-function 'type-number)))
     #'(lambda (location &optional (offset 0))
   (declare (ignore type))
   (let ((reader (reader-function 'type-number)))
     #'(lambda (location &optional (offset 0))

-       (type-from-number (funcall reader location offset) t))))
+       (type-from-number (funcall reader location offset)))))

 
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 
 
 (eval-when (:compile-toplevel :load-toplevel :execute)


@@ -244,6 +244,7 @@ (defmethod validate-superclass ((class ginstance-class) (super standard-class))
 
 ;;;; Registering fundamental types
 
 
 ;;;; Registering fundamental types
 

+(register-type 'nil "void")

 (register-type 'pointer "gpointer")
 (register-type 'char "gchar")
 (register-type 'unsigned-char "guchar")
 (register-type 'pointer "gpointer")
 (register-type 'char "gchar")
 (register-type 'unsigned-char "guchar")