wechat_qr: disable iconv dependancy for mingw

4 years ago · ee5c1847ff
parent d882e6c873
commit ee5c1847ff
1 changed files with 1 additions and 10 deletions
--- 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 <limits>
-
-#if defined(_MSC_VER)
-
-#ifndef NO_ICONV
-#define NO_ICONV
-#endif
-
-#endif
-
 #include <cmath>

 namespace zxing {