Fix https://github.com/Exiv2/exiv2/issues/468

7 years ago · 12d44f8f17
parent 2b0ebd12ca
commit 12d44f8f17
2 changed files with 5 additions and 4 deletions
--- a/include/exiv2/config.h
+++ b/include/exiv2/config.h
@ -67,10 +67,6 @@ typedef int pid_t;
 # ifndef  __MINGW__
 #  define __MINGW__ 1
 # endif
-
-#ifdef EXV_UNICODE_PATH
-#error EXV_UNICODE_PATH is not supported for MinGW builds
-#endif
 #endif

 #ifndef __CYGWIN__
--- a/samples/exifprint.cpp
+++ b/samples/exifprint.cpp
@ -8,6 +8,11 @@
 #include <iomanip>
 #include <cassert>

+// https://github.com/Exiv2/exiv2/issues/468
+#if defined(EXV_UNICODE_PATH) && defined(__MINGW__)
+#undef  EXV_UNICODE_PATH
+#endif
+
 #ifdef  EXV_UNICODE_PATH
 #define _tchar      wchar_t
 #define _tstrcmp    wcscmp