From ee5c1847ff61e4e932955a73c75d9a93d635f8f3 Mon Sep 17 00:00:00 2001 From: berak Date: Wed, 7 Apr 2021 11:32:24 +0200 Subject: [PATCH] wechat_qr: disable iconv dependancy for mingw --- modules/wechat_qrcode/src/zxing/zxing.hpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/modules/wechat_qrcode/src/zxing/zxing.hpp b/modules/wechat_qrcode/src/zxing/zxing.hpp index cae7e7dbac2..11090f74b95 100644 --- a/modules/wechat_qrcode/src/zxing/zxing.hpp +++ b/modules/wechat_qrcode/src/zxing/zxing.hpp @@ -27,7 +27,7 @@ #define USE_ONED_WRITER 1 #endif -#if defined(__ANDROID_API__) +#if defined(__ANDROID_API__) || defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__) #ifndef NO_ICONV #define NO_ICONV @@ -51,15 +51,6 @@ typedef unsigned char boolean; } // namespace zxing #include - -#if defined(_MSC_VER) - -#ifndef NO_ICONV -#define NO_ICONV -#endif - -#endif - #include namespace zxing {