diff options
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index 850d176c08f..90ba461c6bc 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -661,8 +661,8 @@ xd_append_arg (int dtype, Lisp_Object object, DBusMessageIter *iter) | |||
| 661 | xd_extract_signed (object, | 661 | xd_extract_signed (object, |
| 662 | TYPE_MINIMUM (dbus_int64_t), | 662 | TYPE_MINIMUM (dbus_int64_t), |
| 663 | TYPE_MAXIMUM (dbus_int64_t)); | 663 | TYPE_MAXIMUM (dbus_int64_t)); |
| 664 | printmax_t pval = val; | 664 | intmax_t pval = val; |
| 665 | XD_DEBUG_MESSAGE ("%c %"pMd, dtype, pval); | 665 | XD_DEBUG_MESSAGE ("%c %"PRIdMAX, dtype, pval); |
| 666 | if (!dbus_message_iter_append_basic (iter, dtype, &val)) | 666 | if (!dbus_message_iter_append_basic (iter, dtype, &val)) |
| 667 | XD_SIGNAL2 (build_string ("Unable to append argument"), object); | 667 | XD_SIGNAL2 (build_string ("Unable to append argument"), object); |
| 668 | return; | 668 | return; |
| @@ -673,8 +673,8 @@ xd_append_arg (int dtype, Lisp_Object object, DBusMessageIter *iter) | |||
| 673 | dbus_uint64_t val = | 673 | dbus_uint64_t val = |
| 674 | xd_extract_unsigned (object, | 674 | xd_extract_unsigned (object, |
| 675 | TYPE_MAXIMUM (dbus_uint64_t)); | 675 | TYPE_MAXIMUM (dbus_uint64_t)); |
| 676 | uprintmax_t pval = val; | 676 | uintmax_t pval = val; |
| 677 | XD_DEBUG_MESSAGE ("%c %"pMu, dtype, pval); | 677 | XD_DEBUG_MESSAGE ("%c %"PRIuMAX, dtype, pval); |
| 678 | if (!dbus_message_iter_append_basic (iter, dtype, &val)) | 678 | if (!dbus_message_iter_append_basic (iter, dtype, &val)) |
| 679 | XD_SIGNAL2 (build_string ("Unable to append argument"), object); | 679 | XD_SIGNAL2 (build_string ("Unable to append argument"), object); |
| 680 | return; | 680 | return; |
| @@ -867,20 +867,18 @@ xd_retrieve_arg (int dtype, DBusMessageIter *iter) | |||
| 867 | case DBUS_TYPE_INT64: | 867 | case DBUS_TYPE_INT64: |
| 868 | { | 868 | { |
| 869 | dbus_int64_t val; | 869 | dbus_int64_t val; |
| 870 | printmax_t pval; | ||
| 871 | dbus_message_iter_get_basic (iter, &val); | 870 | dbus_message_iter_get_basic (iter, &val); |
| 872 | pval = val; | 871 | intmax_t pval = val; |
| 873 | XD_DEBUG_MESSAGE ("%c %"pMd, dtype, pval); | 872 | XD_DEBUG_MESSAGE ("%c %"PRIdMAX, dtype, pval); |
| 874 | return INT_TO_INTEGER (val); | 873 | return INT_TO_INTEGER (val); |
| 875 | } | 874 | } |
| 876 | 875 | ||
| 877 | case DBUS_TYPE_UINT64: | 876 | case DBUS_TYPE_UINT64: |
| 878 | { | 877 | { |
| 879 | dbus_uint64_t val; | 878 | dbus_uint64_t val; |
| 880 | uprintmax_t pval; | ||
| 881 | dbus_message_iter_get_basic (iter, &val); | 879 | dbus_message_iter_get_basic (iter, &val); |
| 882 | pval = val; | 880 | uintmax_t pval = val; |
| 883 | XD_DEBUG_MESSAGE ("%c %"pMu, dtype, pval); | 881 | XD_DEBUG_MESSAGE ("%c %"PRIuMAX, dtype, pval); |
| 884 | return INT_TO_INTEGER (val); | 882 | return INT_TO_INTEGER (val); |
| 885 | } | 883 | } |
| 886 | 884 | ||