luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 07:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Tor Lillqvist 2008-07-27 15:58:48 +00:00 committed by Tor Lillqvist
parent a076a30457
commit e5e4f8bca3
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gobject/ChangeLog
View File

@ -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.

4
gobject/gtype.c
View File

@ -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));

2
gobject/gtype.h
View File

@ -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;