Constify a lot more items.

[libsigrok.git] / src / backend.c

diff --git a/src/backend.c b/src/backend.c
index 1e92c2f19993910f093f3bf49373aa290df262ae..5be826abaa8352d8314f4ef1128e601dde270838 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
-#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
@@ -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
@@ -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;