Merge branch 'dbus-1.4'

[platform/upstream/dbus.git] / tools / dbus-print-message.c

diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c
index cac4041..75d00ac 100644 (file)
--- a/tools/dbus-print-message.c
+++ b/tools/dbus-print-message.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "dbus-print-message.h"
 
 #include <stdlib.h>
@@ -54,7 +56,7 @@ indent (int depth)
 static void
 print_hex (unsigned char *bytes, unsigned int len, int depth)
 {
-  int i, columns;
+  unsigned int i, columns;
 
   printf ("array of bytes [\n");
 
@@ -227,7 +229,9 @@ print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)
            dbus_int64_t val;
            dbus_message_iter_get_basic (iter, &val);
 #ifdef DBUS_INT64_PRINTF_MODIFIER
-           printf ("int64 %" DBUS_INT64_PRINTF_MODIFIER "d\n", val);
+        printf ("int64 %" DBUS_INT64_PRINTF_MODIFIER "d\n", val);
+#else
+        printf ("int64 (omitted)\n");
 #endif
            break;
          }
@@ -237,7 +241,9 @@ print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)
            dbus_uint64_t val;
            dbus_message_iter_get_basic (iter, &val);
 #ifdef DBUS_INT64_PRINTF_MODIFIER
-           printf ("uint64 %" DBUS_INT64_PRINTF_MODIFIER "u\n", val);
+        printf ("uint64 %" DBUS_INT64_PRINTF_MODIFIER "u\n", val);
+#else
+        printf ("uint64 (omitted)\n");
 #endif
            break;
          }