Use the correct fields for enums and flags. (#145015,Tommi Komulainen)

2004-07-21  Matthias Clasen  <mclasen@redhat.com>

	* glib-genmarshal.c (put_marshal_value_getters): Use the
	correct fields for enums and flags.  (#145015,Tommi Komulainen)

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index b1a8803..8971e69 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib-genmarshal.c (put_marshal_value_getters): Use the 
+       correct fields for enums and flags.  (#145015,Tommi Komulainen) 
+
 Sun Jul 18 18:03:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * === Released 2.5.0 ===

diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c
index 8cc7c24..1c4a4b0 100644 (file)
--- 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);