From 64fd11dfe768cb737efeb4dc204bb483a0a9a872 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 8 Mar 2001 21:34:53 +0000 Subject: [PATCH] Include for memcpy. Thu Mar 8 16:34:22 2001 Owen Taylor * gvaluetransform.c: Include for memcpy. * gvaluetransform.c (DEFINE_SPRINTF): Remove unnecessary and ANSI-illegal ## token pasting. --- gobject/ChangeLog | 7 +++++++ gobject/gvaluetransform.c | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 78a96cd4..a966cb8e 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,10 @@ +Thu Mar 8 16:34:22 2001 Owen Taylor + + * gvaluetransform.c: Include for memcpy. + + * gvaluetransform.c (DEFINE_SPRINTF): Remove unnecessary + and ANSI-illegal ## token pasting. + Thu Mar 8 18:11:52 2001 Tim Janik * gsignal.c: eek, fixed old hook detail storage code. diff --git a/gobject/gvaluetransform.c b/gobject/gvaluetransform.c index 065f31ef..2c28406d 100644 --- a/gobject/gvaluetransform.c +++ b/gobject/gvaluetransform.c @@ -16,6 +16,8 @@ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ +#include + #include "gvalue.h" #include "genums.h" @@ -43,8 +45,8 @@ value_transform_memcpy_data0 (const GValue *src_value, value_transform_##func_name (const GValue *src_value, \ GValue *dest_value) \ { \ - ctype c_value = src_value->data[0].##from_member; \ - dest_value->data[0].##to_member = c_value; \ + ctype c_value = src_value->data[0].from_member; \ + dest_value->data[0].to_member = c_value; \ } DEFINE_CAST (int_s8, v_int, gint8, v_int); DEFINE_CAST (int_u8, v_int, guint8, v_uint); @@ -97,7 +99,7 @@ DEFINE_CAST (double_float, v_double, gfloat, v_float); value_transform_##func_name (const GValue *src_value, \ GValue *dest_value) \ { \ - dest_value->data[0].v_int = src_value->data[0].##from_member != 0; \ + dest_value->data[0].v_int = src_value->data[0].from_member != 0; \ } DEFINE_BOOL_CHECK (int_bool, v_int); DEFINE_BOOL_CHECK (uint_bool, v_uint); @@ -113,7 +115,7 @@ DEFINE_BOOL_CHECK (ulong_bool, v_uint); GValue *dest_value) \ { \ dest_value->data[0].v_pointer = \ - g_strdup_printf ((format), src_value->data[0].##from_member); \ + g_strdup_printf ((format), src_value->data[0].from_member); \ } DEFINE_SPRINTF (int_string, v_int, "%d"); DEFINE_SPRINTF (uint_string, v_uint, "%u"); -- 2.34.1