aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitrii Merkurev <dimorinny@google.com>2022-11-18 17:49:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-11-18 17:49:49 +0000
commitea3799d954e0b1723c0aa199d6511bd3243395ae (patch)
tree872cc26602b8994b786ab4afbae2d28890ac62cf
parent9b632a08d9b1d4aebda90a9a3a397ed1e7ab68af (diff)
parent32c51e05eb961f3d2b55ebdab7556b9cbae09e33 (diff)
downloadmtools-ea3799d954e0b1723c0aa199d6511bd3243395ae.tar.gz
Introduce mock codepages config option for mtools am: 32c51e05ebmain-16k-with-phones
Original change: https://android-review.googlesource.com/c/platform/external/mtools/+/2307102 Change-Id: Ibb47ea12905621ae625bfd508413a9cd433f02c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--codepages.c9
-rw-r--r--config.h5
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;
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