From: Uwe Hermann <redacted>
Date: Sat, 8 Jan 2011 02:51:31 +0000 (+0100)
Subject: Fix two more compiler warnings noticed on amd64.
X-Git-Tag: libsigrok-0.1.0~473
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;h=5e2ddeb098b677faca5d044f3523f5f6f3382d90;p=libsigrok.git

Fix two more compiler warnings noticed on amd64.
---

diff --git a/device.c b/device.c
index 1f46573b..84cf6d1f 100644
--- a/device.c
+++ b/device.c
@@ -43,8 +43,9 @@ void device_scan(void)
 		g_message("initializing %s plugin", plugin->name);
 		num_devices = plugin->init(NULL);
 		for (i = 0; i < num_devices; i++) {
-			num_probes = (int)plugin->get_device_info(i,
-							DI_NUM_PROBES);
+			num_probes
+			  = (int)(unsigned long)plugin->get_device_info(i,
+			    DI_NUM_PROBES);
 			device_new(plugin, i, num_probes);
 		}
 	}
diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index e12ed6f9..316acfeb 100644
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -443,7 +443,7 @@ static int *hw_get_capabilities(void)
 /* TODO: This will set the same samplerate for all devices. */
 static int set_configuration_samplerate(uint64_t samplerate)
 {
-	g_message("%s(%llu)", __FUNCTION__, samplerate);
+	g_message("%s(%" PRIu64 ")", __FUNCTION__, samplerate);
 	if (samplerate > MHZ(1))
 		analyzer_set_freq(samplerate / MHZ(1), FREQ_SCALE_MHZ);
 	else if (samplerate > KHZ(1))