X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fbackend.c;h=5be826abaa8352d8314f4ef1128e601dde270838;hb=5dd538ded0d5873541af7cdf2e54c3e6d8297b49;hp=4889358a9d6fd9e06fbe6446f76df060e0f429cc;hpb=bd7b83cf631d515ae7e9560400cef2d9f662299a;p=libsigrok.git
diff --git a/src/backend.c b/src/backend.c
index 4889358a..5be826ab 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -18,9 +18,9 @@
* along with this program. If not, see .
*/
+#include
#include
-#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
/** @cond PRIVATE */
@@ -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
@@ -137,32 +137,36 @@ static void print_versions(void)
GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION,
glib_major_version, glib_minor_version, glib_micro_version,
glib_binary_age, glib_interface_age);
- g_string_append_printf(s, "libzip %s, ", HAVE_LIBZIP_VER);
+ g_string_append_printf(s, "libzip %s, ", CONF_LIBZIP_VERSION);
#ifdef HAVE_LIBSERIALPORT
g_string_append_printf(s, "libserialport %s/%s (rt: %s/%s), ",
SP_PACKAGE_VERSION_STRING, SP_LIB_VERSION_STRING,
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, ", HAVE_LIBFTDI_VER);
+ g_string_append_printf(s, "libftdi %s, ", CONF_LIBFTDI_VERSION);
#endif
#ifdef HAVE_LIBGPIB
- g_string_append_printf(s, "libgpib %s, ", HAVE_LIBGPIB_VER);
+ g_string_append_printf(s, "libgpib %s, ", CONF_LIBGPIB_VERSION);
#endif
#ifdef HAVE_LIBREVISA
- g_string_append_printf(s, "librevisa %s, ", HAVE_LIBREVISA_VER);
+ g_string_append_printf(s, "librevisa %s, ", CONF_LIBREVISA_VERSION);
#endif
s->str[s->len - 2] = '.';
s->str[s->len - 1] = '\0';
sr_dbg("%s", s->str);
s = g_string_truncate(s, 0);
- g_string_append_printf(s, "Host: %s, ", HOST);
+ g_string_append_printf(s, "Host: %s, ", CONF_HOST);
#ifdef WORDS_BIGENDIAN
g_string_append_printf(s, "big-endian.");
#else
@@ -506,6 +510,7 @@ SR_API int sr_init(struct sr_context **ctx)
goto done;
}
#endif
+ sr_resource_set_hooks(context, NULL, NULL, NULL, NULL);
*ctx = context;
context = NULL;