From be33e58489110d74b5b8e45f58ed3e046ac5a809 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 4 Sep 2022 12:47:21 +0200 Subject: windows: Fix build with --disable-log On Windows we use UNREFERENCED_PARAMETER for UNUSED (commit 521105f). UNREFERENCED_PARAMETER evaluates to {(ctx) = (ctx);} which errors out: error: lvalue required as left operand of assignment. in the cases where ctx is NULL. Closes #1152 [Tormod: Add ctx reference to avoid unused variable warnings] Signed-off-by: Tormod Volden --- libusb/libusbi.h | 8 ++++---- libusb/version_nano.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libusb/libusbi.h b/libusb/libusbi.h index e399666..72d2568 100644 --- a/libusb/libusbi.h +++ b/libusb/libusbi.h @@ -322,10 +322,10 @@ void usbi_log(struct libusb_context *ctx, enum libusb_log_level level, #else /* ENABLE_LOGGING */ -#define usbi_err(ctx, ...) UNUSED(ctx) -#define usbi_warn(ctx, ...) UNUSED(ctx) -#define usbi_info(ctx, ...) UNUSED(ctx) -#define usbi_dbg(ctx, ...) do {} while (0) +#define usbi_err(ctx, ...) do { (void)(ctx); } while(0) +#define usbi_warn(ctx, ...) do { (void)(ctx); } while(0) +#define usbi_info(ctx, ...) do { (void)(ctx); } while(0) +#define usbi_dbg(ctx, ...) do { (void)(ctx); } while(0) #endif /* ENABLE_LOGGING */ diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 69f515c..32a24b1 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11746 +#define LIBUSB_NANO 11747 -- cgit v1.2.1