diff options
| author | Dmitrii Merkurev <dimorinny@google.com> | 2022-11-18 18:42:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-18 18:42:02 +0000 |
| commit | c1a99ade63b652dcc5659e5d6de4e7592ef786f5 (patch) | |
| tree | 872cc26602b8994b786ab4afbae2d28890ac62cf | |
| parent | 9b632a08d9b1d4aebda90a9a3a397ed1e7ab68af (diff) | |
| parent | ea3799d954e0b1723c0aa199d6511bd3243395ae (diff) | |
| download | mtools-c1a99ade63b652dcc5659e5d6de4e7592ef786f5.tar.gz | |
Introduce mock codepages config option for mtools am: 32c51e05eb am: ea3799d954android-u-beta-3-gplandroid-u-beta-2-gplandroid-u-beta-1-gpl
Original change: https://android-review.googlesource.com/c/platform/external/mtools/+/2307102
Change-Id: Ib9f256c8b2a6d40b80bddce45bd275d685bb36d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | codepages.c | 9 | ||||
| -rw-r--r-- | config.h | 5 |
2 files changed, 13 insertions, 1 deletions
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 @@ Codepage_t codepages[]= { { 0 } }; +#endif + #else /* Should down ISO C forbids an empty translation unit warning [-Wpedantic]: */ typedef int make_iso_compilers_happy; @@ -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 |