always define GType unconditionally in terms of gsize, there's no need to

Thu Jun 14 23:32:00 2007  Tim Janik  <timj@gtk.org>

        * gtype.h: always define GType unconditionally in terms of gsize,
        there's no need to jump through a glong hoop ever and this fixes
        the printf modifier to %zu.

svn path=/trunk/; revision=5560

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index fcac666..5afab27 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 14 23:32:00 2007  Tim Janik  <timj@gtk.org>
+
+       * gtype.h: always define GType unconditionally in terms of gsize,
+       there's no need to jump through a glong hoop ever and this fixes
+       the printf modifier to %zu.
+
 Thu Jun 14 22:33:11 2007  Tim Janik  <timj@imendio.com>
 
        * gparamspecs.c (g_param_spec_types_init): work around SGI IDO cc,

diff --git a/gobject/gtype.h b/gobject/gtype.h
index 1586888..0d9d677 100644 (file)
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -88,11 +88,7 @@ G_BEGIN_DECLS
 
 /* Typedefs
  */
-#if    GLIB_SIZEOF_LONG == GLIB_SIZEOF_SIZE_T
-typedef gulong                          GType;
-#else  /* hm, shouldn't happen? */
 typedef gsize                           GType;
-#endif
 typedef struct _GValue                  GValue;
 typedef union  _GTypeCValue             GTypeCValue;
 typedef struct _GTypePlugin             GTypePlugin;