diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-07-27 15:58:48 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-07-27 15:58:48 +0000 |
| commit | e5e4f8bca3d47dd6db384cc62c225faa469d66db (patch) | |
| tree | fa767e12dd47c7a1f2037d9f3c1b90daceb9f677 /gobject | |
| parent | a076a3045770456e6932d41eba97adf9b19b43f4 (diff) | |
| download | glib-e5e4f8bca3d47dd6db384cc62c225faa469d66db.tar.gz | |
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
Diffstat (limited to 'gobject')
| -rw-r--r-- | gobject/ChangeLog | 6 | ||||
| -rw-r--r-- | gobject/gtype.c | 4 | ||||
| -rw-r--r-- | gobject/gtype.h | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/gobject/ChangeLog b/gobject/ChangeLog index aa2e8341c..9735b20f5 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,5 +1,11 @@ 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. 2008-07-24 Tor Lillqvist <tml@novell.com> diff --git a/gobject/gtype.c b/gobject/gtype.c index 4306332e7..aec118a27 100644 --- 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 2988fb478..e2b3c7042 100644 --- 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; |