From 533dd9229a846d6ab00c4dced1cbddf66b576258 Mon Sep 17 00:00:00 2001 From: wet34t Date: Tue, 19 Nov 2019 11:13:03 -0500 Subject: [PATCH] libusb: allow hidapi to be configured without using iconv --- libusb/hid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libusb/hid.c b/libusb/hid.c index 49ba619..8a1ae64 100644 --- a/libusb/hid.c +++ b/libusb/hid.c @@ -45,7 +45,7 @@ /* GNU / LibUSB */ #include -#ifndef __ANDROID__ +#if !defined(__ANDROID__) && !defined(NO_ICONV) #include #endif @@ -395,7 +395,7 @@ static wchar_t *get_usb_string(libusb_device_handle *dev, uint8_t idx) int len; wchar_t *str = NULL; -#ifndef __ANDROID__ /* we don't use iconv on Android */ +#if !defined(__ANDROID__) && !defined(NO_ICONV) /* we don't use iconv on Android, or when it is explicitly disabled */ wchar_t wbuf[256]; /* iconv variables */ iconv_t ic; @@ -421,7 +421,7 @@ static wchar_t *get_usb_string(libusb_device_handle *dev, uint8_t idx) if (len < 0) return NULL; -#ifdef __ANDROID__ +#if defined(__ANDROID__) || defined(NO_ICONV) /* Bionic does not have iconv support nor wcsdup() function, so it has to be done manually. The following code will only work for