--- tools/dbus-print-message.orig	Tue Jul 18 21:29:37 2006
+++ tools/dbus-print-message.c	Tue Jul 18 21:34:07 2006
@@ -129,6 +129,7 @@ print_iter (DBusMessageIter *iter, dbus_
 	    break;
 	  }
 
+#ifdef DBUS_HAVE_INT64
 	case DBUS_TYPE_INT64:
 	  {
 	    dbus_int64_t val;
@@ -144,6 +145,7 @@ print_iter (DBusMessageIter *iter, dbus_
 	    printf ("uint64 %llu\n", val);
 	    break;
 	  }
+#endif /* !DBUS_HAVE_INT64 */
 
 	case DBUS_TYPE_DOUBLE:
 	  {
--- tools/dbus-send.orig	Tue Jul 18 21:35:02 2006
+++ tools/dbus-send.c	Tue Jul 18 21:36:04 2006
@@ -43,8 +43,10 @@ append_arg (DBusMessageIter *iter, int t
   dbus_int16_t int16;
   dbus_uint32_t uint32;
   dbus_int32_t int32;
+#ifdef DBUS_HAVE_INT64
   dbus_uint64_t uint64;
   dbus_int64_t int64;
+#endif
   double d;
   unsigned char byte;
   dbus_bool_t v_BOOLEAN;
@@ -82,6 +84,7 @@ append_arg (DBusMessageIter *iter, int t
       dbus_message_iter_append_basic (iter, DBUS_TYPE_UINT32, &uint32);
       break;
 
+#ifdef DBUS_HAVE_INT64
     case DBUS_TYPE_INT64:
       int64 = strtoll (value, NULL, 0);
       dbus_message_iter_append_basic (iter, DBUS_TYPE_INT64, &int64);
@@ -91,6 +94,7 @@ append_arg (DBusMessageIter *iter, int t
       uint64 = strtoull (value, NULL, 0);
       dbus_message_iter_append_basic (iter, DBUS_TYPE_UINT64, &uint64);
       break;
+#endif
 
     case DBUS_TYPE_STRING:
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &value);