diff options
| author | Dmitrii Merkurev <dimorinny@google.com> | 2022-11-18 19:44:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-18 19:44:43 +0000 |
| commit | d25449ff09cdbac4a5797c767af18cd584a20bc9 (patch) | |
| tree | 872cc26602b8994b786ab4afbae2d28890ac62cf | |
| parent | 3fcfaddac19a016f48535287c461ff565a43767e (diff) | |
| parent | c1a99ade63b652dcc5659e5d6de4e7592ef786f5 (diff) | |
| download | mtools-d25449ff09cdbac4a5797c767af18cd584a20bc9.tar.gz | |
Introduce mock codepages config option for mtools am: 32c51e05eb am: ea3799d954 am: c1a99ade63android-u-qpr1-beta-2.2-gplandroid-u-qpr1-beta-1-gplandroid-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-dev
Original change: https://android-review.googlesource.com/c/platform/external/mtools/+/2307102
Change-Id: If51ee48d5a8eac9964fd945d91fa1ba62f1596d6
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 |