From a2468631c9d832243ebbc3467af663fba3187586 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 21 Jul 2004 18:00:31 +0000 Subject: [PATCH] Use the correct fields for enums and flags. (#145015,Tommi Komulainen) 2004-07-21 Matthias Clasen * glib-genmarshal.c (put_marshal_value_getters): Use the correct fields for enums and flags. (#145015,Tommi Komulainen) --- gobject/ChangeLog | 5 +++++ gobject/glib-genmarshal.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 359c3a99e..e63fcf190 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,8 @@ +2004-07-21 Matthias Clasen + + * glib-genmarshal.c (put_marshal_value_getters): Use the + correct fields for enums and flags. (#145015,Tommi Komulainen) + 2004-07-12 Matthias Clasen * gsignal.c (g_signal_handler_is_connected): Don't choke diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c index 8cc7c2449..1c4a4b0c4 100644 --- a/gobject/glib-genmarshal.c +++ b/gobject/glib-genmarshal.c @@ -162,8 +162,8 @@ put_marshal_value_getters (void) fputs ("#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong\n", fout); fputs ("#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64\n", fout); fputs ("#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64\n", fout); - fputs ("#define g_marshal_value_peek_enum(v) (v)->data[0].v_int\n", fout); - fputs ("#define g_marshal_value_peek_flags(v) (v)->data[0].v_uint\n", fout); + fputs ("#define g_marshal_value_peek_enum(v) (v)->data[0].v_long\n", fout); + fputs ("#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong\n", fout); fputs ("#define g_marshal_value_peek_float(v) (v)->data[0].v_float\n", fout); fputs ("#define g_marshal_value_peek_double(v) (v)->data[0].v_double\n", fout); fputs ("#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer\n", fout);