luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Define G_TYPE_FORMAT as the printf format for a GType value. Either

Browse Source 
2008-07-24  Tor Lillqvist  <tml@novell.com>

	* gtype.h: Define G_TYPE_FORMAT as the printf format for a GType
	value. Either G_GSIZE_FORMAT or "lu".

	* gtype.c: Use it instead of the C99 zu.


svn path=/trunk/; revision=7250
This commit is contained in:
Tor Lillqvist 2008-07-24 01:11:52 +00:00 committed by Tor Lillqvist
parent 440ebdec6f
commit b46641eab2
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gobject/ChangeLog
View File

@ -1,3 +1,10 @@
2008-07-24 Tor Lillqvist <tml@novell.com>
* gtype.h: Define G_TYPE_FORMAT as the printf format for a GType
value. Either G_GSIZE_FORMAT or "lu".
* gtype.c: Use it instead of the C99 zu.
2008-07-23 Matthias Clasen <mclasen2redhat.com>
544177 - Fix trivial cut and paste error in documentation

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 (%zu)",
g_warning ("attempt to register fundamental type `%s' with invalid type id (%" G_TYPE_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 `%zu' is invalid", type);
g_warning (G_STRLOC ": type id `%" G_TYPE_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,8 +365,10 @@ 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;