From 12d44f8f17bb541d5ce0c05e6020bc5d79a03e34 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Tue, 9 Oct 2018 18:36:41 +0100 Subject: [PATCH] Fix https://github.com/Exiv2/exiv2/issues/468 --- include/exiv2/config.h | 4 ---- samples/exifprint.cpp | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/exiv2/config.h b/include/exiv2/config.h index 41082d83..45e45450 100644 --- 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__ diff --git a/samples/exifprint.cpp b/samples/exifprint.cpp index c1bff835..c74e6b1c 100644 --- a/samples/exifprint.cpp +++ b/samples/exifprint.cpp @@ -8,6 +8,11 @@ #include #include +// 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