From 72643a60711fa66360108774291872f00db91523 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Thu, 12 Dec 2002 23:00:24 +0000 Subject: [PATCH] use G_G[U]INT64_FORMAT unconditionally, since we'll always have it now. Thu Dec 12 15:00:10 2002 Manish Singh * gvaluetransform.c: use G_G[U]INT64_FORMAT unconditionally, since we'll always have it now. --- gobject/ChangeLog | 5 +++++ gobject/gvaluetransform.c | 9 --------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 91bb211..198be61 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 12 15:00:10 2002 Manish Singh + + * gvaluetransform.c: use G_G[U]INT64_FORMAT unconditionally, + since we'll always have it now. + 2002-12-07 Matthias Clasen * gparam.c (canonalize_key): Rename to canonicalize_key. Adjust diff --git a/gobject/gvaluetransform.c b/gobject/gvaluetransform.c index d332f74..917d8e9 100644 --- a/gobject/gvaluetransform.c +++ b/gobject/gvaluetransform.c @@ -20,7 +20,6 @@ #include "gvalue.h" #include "genums.h" -#include "glibconfig.h" /* G_G[U]INT64_FORMAT */ /* same type transforms @@ -166,12 +165,8 @@ DEFINE_SPRINTF (int_string, v_int, "%d"); DEFINE_SPRINTF (uint_string, v_uint, "%u"); DEFINE_SPRINTF (long_string, v_long, "%ld"); DEFINE_SPRINTF (ulong_string, v_ulong, "%lu"); -#ifdef G_GINT64_FORMAT DEFINE_SPRINTF (int64_string, v_int64, "%" G_GINT64_FORMAT); -#endif -#ifdef G_GUINT64_FORMAT DEFINE_SPRINTF (uint64_string, v_uint64, "%" G_GUINT64_FORMAT); -#endif DEFINE_SPRINTF (float_string, v_float, "%f"); DEFINE_SPRINTF (double_string, v_double, "%f"); @@ -367,9 +362,7 @@ g_value_transforms_init (void) /* sync with gtype.c */ g_value_register_transform_func (G_TYPE_INT64, G_TYPE_FLAGS, value_transform_int64_uint); g_value_register_transform_func (G_TYPE_INT64, G_TYPE_FLOAT, value_transform_int64_float); g_value_register_transform_func (G_TYPE_INT64, G_TYPE_DOUBLE, value_transform_int64_double); -#ifdef G_GINT64_FORMAT g_value_register_transform_func (G_TYPE_INT64, G_TYPE_STRING, value_transform_int64_string); -#endif g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_CHAR, value_transform_uint64_s8); g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_UCHAR, value_transform_uint64_u8); g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_BOOLEAN, value_transform_uint64_bool); @@ -386,9 +379,7 @@ g_value_transforms_init (void) /* sync with gtype.c */ g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_FLOAT, value_transform_uint64_float); g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_DOUBLE, value_transform_uint64_double); #endif -#ifdef G_GUINT64_FORMAT g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_STRING, value_transform_uint64_string); -#endif g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_CHAR, value_transform_int_s8); g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_UCHAR, value_transform_int_u8); SKIP____register_transform_func (G_TYPE_ENUM, G_TYPE_BOOLEAN, value_transform_int_bool); -- 2.7.4