BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Uwe Hermann 2015-08-18 17:58:28 +02:00
parent dbde3b6513
commit 731c01f248
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend.c
View File

@ -122,7 +122,7 @@
static void print_versions(void) static void print_versions(void)
{ {
GString *s; GString *s;
#ifdef HAVE_LIBUSB_1_0 #if defined(HAVE_LIBUSB_1_0) && !defined(__FreeBSD__)
const struct libusb_version *lv; const struct libusb_version *lv;
#endif #endif
@ -144,10 +144,14 @@ static void print_versions(void)
sp_get_package_version_string(), sp_get_lib_version_string()); sp_get_package_version_string(), sp_get_lib_version_string());
#endif #endif
#ifdef HAVE_LIBUSB_1_0 #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(); lv = libusb_get_version();
g_string_append_printf(s, "libusb-1.0 %d.%d.%d.%d%s, ", g_string_append_printf(s, "libusb-1.0 %d.%d.%d.%d%s, ",
lv->major, lv->minor, lv->micro, lv->nano, lv->rc); lv->major, lv->minor, lv->micro, lv->nano, lv->rc);
#endif #endif
#endif
#ifdef HAVE_LIBFTDI #ifdef HAVE_LIBFTDI
g_string_append_printf(s, "libftdi %s, ", CONF_LIBFTDI_VERSION); g_string_append_printf(s, "libftdi %s, ", CONF_LIBFTDI_VERSION);
#endif #endif