Merge branch 'dbus-1.2'

Conflicts:
	bus/dispatch.c
	configure.in
	test/name-test/test-names.c

1 files changed, 11 insertions, 2 deletions

diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c
index b7c3f098..0b8ca267 100644
--- a/tools/dbus-print-message.c
+++ b/tools/dbus-print-message.c
@@ -24,6 +24,7 @@
 #include "dbus-print-message.h"
 
 #include <stdlib.h>
+#include "config.h"
 
 static const char*
 type_to_name (int message_type)
@@ -227,7 +228,11 @@ print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)
 	  {
 	    dbus_int64_t val;
 	    dbus_message_iter_get_basic (iter, &val);
-	    printf ("int64 %lld\n", val);
+#ifdef DBUS_INT64_PRINTF_MODIFIER
+        printf ("int64 %" DBUS_INT64_PRINTF_MODIFIER "d\n", val);
+#else
+        printf ("int64 (omitted)\n");
+#endif
 	    break;
 	  }
 
@@ -235,7 +240,11 @@ print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)
 	  {
 	    dbus_uint64_t val;
 	    dbus_message_iter_get_basic (iter, &val);
-	    printf ("uint64 %llu\n", val);
+#ifdef DBUS_INT64_PRINTF_MODIFIER
+        printf ("uint64 %" DBUS_INT64_PRINTF_MODIFIER "u\n", val);
+#else
+        printf ("uint64 (omitted)\n");
+#endif
 	    break;
 	  }