dbus/glib dbus-gvalue.c,1.1,1.2

[Michael Meeks]

Update of /cvs/dbus/dbus/glib
In directory pdx:/tmp/cvs-serv26544/glib

Modified Files:
	dbus-gvalue.c 
Log Message:
2004-05-28  Michael Meeks  <michael at ximian.com>

	* glib/dbus-gvalue.c (dbus_gvalue_marshal, dbus_gvalue_demarshal): 
	fix no int64 case.

	* dbus/dbus-string.c (_dbus_string_parse_basic_type): impl.

	* dbus/dbus-message.c (_dbus_message_iter_get_basic_type),
	(_dbus_message_iter_get_basic_type_array): impl.
	drastically simplify ~all relevant _get methods to use these.
	(_dbus_message_iter_append_basic_array),
	(dbus_message_iter_append_basic): impl
	drastically simplify ~all relevant _append methods to use these.

	* dbus/dbus-message-builder.c (parse_basic_type) 
	(parse_basic_array, lookup_basic_type): impl.
	(_dbus_message_data_load): prune scads of duplicate /
	cut & paste coding.

	* dbus/dbus-marshal.c (_dbus_demarshal_basic_type_array) 
	(_dbus_demarshal_basic_type): implement,
	(demarshal_and_validate_len/arg): beef up debug.
	(_dbus_marshal_basic_type, _dbus_marshal_basic_type_array): impl.



Index: dbus-gvalue.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gvalue.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/dbus-gvalue.c	29 Mar 2004 13:24:50 -0000	1.1
+++ b/dbus-gvalue.c	28 May 2004 13:10:36 -0000	1.2
@@ -17,8 +17,10 @@
     MAP(TYPE_BOOLEAN, get_boolean, TYPE_BOOLEAN , set_boolean);
     MAP(TYPE_INT32, get_int32, TYPE_INT , set_int);
     MAP(TYPE_UINT32, get_uint32, TYPE_UINT , set_uint);
+#ifdef DBUS_HAVE_INT64
     MAP(TYPE_INT64, get_int64, TYPE_INT64 , set_int64);
     MAP(TYPE_UINT64, get_uint64, TYPE_UINT64 , set_uint64);
+#endif
     MAP(TYPE_DOUBLE, get_double, TYPE_DOUBLE , set_double);
     case DBUS_TYPE_STRING:
       {
@@ -82,6 +84,7 @@
       dbus_message_iter_append_uint32 (iter,
                                        g_value_get_ulong (value));
       break;
+#ifdef DBUS_HAVE_INT64
     case G_TYPE_INT64:
       dbus_message_iter_append_int64 (iter,
                                       g_value_get_int64 (value));
@@ -90,6 +93,7 @@
       dbus_message_iter_append_uint64 (iter,
                                        g_value_get_uint64 (value));
       break;
+#endif
     case G_TYPE_FLOAT:
       dbus_message_iter_append_double (iter,
                                        g_value_get_float (value));