diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-01-17 19:49:52 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-01-17 19:49:52 +0000 |
| commit | 62e465339a306fa564b69935da494dad6e1b474a (patch) | |
| tree | 0c75e656937e148983dbf3ea313b0bb9efb9f6c6 /glib | |
| parent | 7bf62e31a3c820852271768fafc04ba95c31a19f (diff) | |
2005-01-17 Havoc Pennington <hp@redhat.com>
* dbus/dbus-types.h: hardcode dbus_bool_t to 32 bits
* Throughout: modify DBUS_TYPE_BOOLEAN to be a 32-bit type instead
of an 8-bit type. Now dbus_bool_t is the type to use whenever you
are marshaling/unmarshaling a boolean.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/dbus-gvalue.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/glib/dbus-gvalue.c b/glib/dbus-gvalue.c index b44640ce..1fed0cf7 100644 --- a/glib/dbus-gvalue.c +++ b/glib/dbus-gvalue.c @@ -34,6 +34,8 @@ dbus_gvalue_demarshal (DBusMessageIter *iter, GValue *value) g_value_init (value, G_TYPE_##g_t); \ dbus_message_iter_get_basic (iter, &value->data[0]); \ break + + g_assert (sizeof (dbus_bool_t) == sizeof (value->data[0].v_int)); switch (dbus_message_iter_get_arg_type (iter)) { @@ -98,7 +100,7 @@ dbus_gvalue_marshal (DBusMessageIter *iter, GValue *value) break; case G_TYPE_BOOLEAN: { - unsigned char b = g_value_get_boolean (value); + dbus_bool_t b = g_value_get_boolean (value); if (!dbus_message_iter_append_basic (iter, DBUS_TYPE_BOOLEAN, &b)) |