gtype.h Revert my change from 2008-07-24. No G_TYPE_FORMAT is needed. Just

2008-07-27  Tor Lillqvist  <tml@novell.com>

	* gtype.h
	* gtype.c: Revert my change from 2008-07-24. No G_TYPE_FORMAT is
	needed. Just use G_GSIZE_FORMAT always when printing GType values.

svn path=/trunk/; revision=7256

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index aa2e8341c864158bd4e37204692ffaf0445c014c..9735b20f57de12185c4c8fb267e2b47c1028a8db 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-27  Tor Lillqvist  <tml@novell.com>
+
+       * gtype.h
+       * gtype.c: Revert my change from 2008-07-24. No G_TYPE_FORMAT is
+       needed. Just use G_GSIZE_FORMAT always when printing GType values.
+
 2008-07-27  Tor Lillqvist  <tml@novell.com>
 
        * Makefile.am (gobject-2.0.lib): Pass appropriate -machine flag to lib.exe.

diff --git a/gobject/gtype.c b/gobject/gtype.c
index 4306332e7a5169881dad8049a717e5bee5942cc0..aec118a27cb51c783745f7d48d60e4e712e4275c 100644 (file)
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -2355,7 +2355,7 @@ g_type_register_fundamental (GType                       type_id,
   if ((type_id & TYPE_ID_MASK) ||
       type_id > G_TYPE_FUNDAMENTAL_MAX)
     {
-      g_warning ("attempt to register fundamental type `%s' with invalid type id (%" G_TYPE_FORMAT ")",
+      g_warning ("attempt to register fundamental type `%s' with invalid type id (%" G_GSIZE_FORMAT ")",
                 type_name,
                 type_id);
       return 0;
@@ -3937,7 +3937,7 @@ g_type_value_table_peek (GType type)
     return vtable;
   
   if (!node)
-    g_warning (G_STRLOC ": type id `%" G_TYPE_FORMAT "' is invalid", type);
+    g_warning (G_STRLOC ": type id `%" G_GSIZE_FORMAT "' is invalid", type);
   if (!has_refed_data)
     g_warning ("can't peek value table for type `%s' which is not currently referenced",
               type_descriptive_name_I (type));

diff --git a/gobject/gtype.h b/gobject/gtype.h
index 2988fb47801cd88f2104874d17c3cdb04af5530c..e2b3c7042ab185d6136cc6d89402a6e90253c2c5 100644 (file)
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -365,10 +365,8 @@ G_BEGIN_DECLS
  */
 #if     GLIB_SIZEOF_SIZE_T != GLIB_SIZEOF_LONG || !defined __cplusplus
 typedef gsize                           GType;
-#define G_TYPE_FORMAT G_GSIZE_FORMAT
 #else   /* for historic reasons, C++ links against gulong GTypes */
 typedef gulong                          GType;
-#define G_TYPE_FORMAT "lu"
 #endif
 typedef struct _GValue                  GValue;
 typedef union  _GTypeCValue             GTypeCValue;