From: Chengwei Yang <chengwei.yang@intel.com>
Date: Thu, 26 Sep 2013 09:35:36 +0000 (+0800)
Subject: Fix build on NetBSD 6.1.1 with gcc 4.5.3
X-Git-Tag: dbus-1.7.6~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd5271f83996956ee326441f450ffd5e5e8e91d0;p=thirdparty%2Fdbus.git

Fix build on NetBSD 6.1.1 with gcc 4.5.3

There are two build failure on NetBSD 6.1.1 with gcc 4.5.3, the first
one is char to int, warning treated as error. The second one is a mismatch
between format string and arguments.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69842
[adjusted commit message -smcv]
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 14fa226d4..b071fcc55 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -132,7 +132,7 @@ read_machine_uuid_if_needed (void)
     goto out;
 
   /* rstrip the read uuid */
-  while (len > 31 && isspace(uuid[len - 1]))
+  while (len > 31 && isspace((int) uuid[len - 1]))
     len--;
 
   if (len != 32)
diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
index 7382f4bf1..cf17f6428 100644
--- a/tools/dbus-monitor.c
+++ b/tools/dbus-monitor.c
@@ -106,6 +106,9 @@ monitor_filter_func (DBusConnection     *connection,
 
 #ifdef __APPLE__
 #define PROFILE_TIMED_FORMAT "%s\t%lu\t%d"
+#elif defined(__NetBSD__)
+#include <inttypes.h>
+#define PROFILE_TIMED_FORMAT "%s\t%" PRId64 "\t%d"
 #else
 #define PROFILE_TIMED_FORMAT "%s\t%lu\t%lu"
 #endif