From: Uwe Hermann <redacted>
Date: Tue, 18 Aug 2015 15:58:28 +0000 (+0200)
Subject: FreeBSD: Fix compile/link error due to missing libusb_get_version().
X-Git-Tag: libsigrok-0.4.0~420
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=731c01f248b8b7b9bd87e6b21ee92f806eff762b;p=libsigrok.git

FreeBSD: Fix compile/link error due to missing libusb_get_version().

The FreeBSD libusb-1.0 API implementation doesn't have libusb_get_version().
Use our CONF_LIBUSB_1_0_VERSION macro instead.
---

diff --git a/src/backend.c b/src/backend.c
index 1e92c2f1..5d0a0c93 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -122,7 +122,7 @@
 static void print_versions(void)
 {
 	GString *s;
-#ifdef HAVE_LIBUSB_1_0
+#if defined(HAVE_LIBUSB_1_0) && !defined(__FreeBSD__)
 	const struct libusb_version *lv;
 #endif
 
@@ -144,10 +144,14 @@ static void print_versions(void)
 		sp_get_package_version_string(), sp_get_lib_version_string());
 #endif
 #ifdef HAVE_LIBUSB_1_0
+#ifdef __FreeBSD__
+	g_string_append_printf(s, "libusb-1.0 %s, ", CONF_LIBUSB_1_0_VERSION);
+#else
 	lv = libusb_get_version();
 	g_string_append_printf(s, "libusb-1.0 %d.%d.%d.%d%s, ",
 		lv->major, lv->minor, lv->micro, lv->nano, lv->rc);
 #endif
+#endif
 #ifdef HAVE_LIBFTDI
 	g_string_append_printf(s, "libftdi %s, ", CONF_LIBFTDI_VERSION);
 #endif