Introduce mock codepages config option for mtools am: 32c51e05eb am: ea3799d954 am: c1a99ade63 Original change: https://android-review.googlesource.com/c/platform/external/mtools/+/2307102 Change-Id: If51ee48d5a8eac9964fd945d91fa1ba62f1596d6 Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/codepages.c b/codepages.c index ecb99ee..944131c 100644 --- a/codepages.c +++ b/codepages.c
@@ -20,6 +20,13 @@ #ifndef HAVE_ICONV_H #include "codepage.h" +#ifdef USE_MOCK_CODEPAGES +Codepage_t codepages[]= { + { 850, + "" + }, +}; +#else Codepage_t codepages[]= { { 437, "ÇüéâäàåçêëèïîìÄÅ" @@ -113,6 +120,8 @@ { 0 } }; +#endif + #else /* Should down ISO C forbids an empty translation unit warning [-Wpedantic]: */ typedef int make_iso_compilers_happy;
diff --git a/config.h b/config.h index 582e419..b9223b9 100644 --- a/config.h +++ b/config.h
@@ -53,7 +53,10 @@ #define HAVE_HTONS 1 /* Define to 1 if you have the <iconv.h> header file. */ -#define HAVE_ICONV_H 1 +/* #undef HAVE_ICONV_H */ + +/* Define to 1 if you want to use mock code pages. */ +#define USE_MOCK_CODEPAGES 1 /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1