summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libusb/core.c1
-rw-r--r--libusb/libusbi.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/libusb/core.c b/libusb/core.c
index 64b32cc..a66cd58 100644
--- a/libusb/core.c
+++ b/libusb/core.c
@@ -1534,6 +1534,7 @@ API_EXPORTED int libusb_init(libusb_context **context)
return 0;
err:
+ usbi_default_context = NULL;
usbi_mutex_static_unlock(&default_context_lock);
usbi_mutex_destroy(&ctx->open_devs_lock);
usbi_mutex_destroy(&ctx->usb_devs_lock);
diff --git a/libusb/libusbi.h b/libusb/libusbi.h
index 8a26907..6f6b84b 100644
--- a/libusb/libusbi.h
+++ b/libusb/libusbi.h
@@ -158,7 +158,7 @@ void inline usbi_err( struct libusb_context *ctx, const char *format, ...)
LOG_BODY(ctx,LOG_LEVEL_ERROR)
void inline usbi_dbg(const char *format, ...)
-#ifdef ENABLE_DEBUG_LOGGING
+#if defined(ENABLE_DEBUG_LOGGING) || defined(INCLUDE_DEBUG_LOGGING)
LOG_BODY(NULL,LOG_LEVEL_DEBUG)
#else
{ }