diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-24 04:44:36 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-24 04:44:36 +0000 |
commit | 2d9b6ac2326e389d1dc4d1a1f718b05e8c9a2f6d (patch) | |
tree | a84c16aac8c9bc06cb616d9b912cd0f312091f5d | |
parent | c33b84ba89ba038a45a1ce4a98e7783db27e30e5 (diff) | |
parent | c15ae94327d9cd5a04d1a9436fc9e477d19cf840 (diff) | |
download | mtools-2d9b6ac2326e389d1dc4d1a1f718b05e8c9a2f6d.tar.gz |
Snap for 7487883 from c15ae94327d9cd5a04d1a9436fc9e477d19cf840 to sdk-releaseplatform-tools-31.0.3
Change-Id: I021e6b58f7dd067d16ed637ea92b1138778f7c11
-rw-r--r-- | charsetConv.c | 4 | ||||
-rw-r--r-- | config.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/charsetConv.c b/charsetConv.c index 8734be5..085d887 100644 --- a/charsetConv.c +++ b/charsetConv.c @@ -102,8 +102,8 @@ doscp_t *cp_open(int codepage) { char dosCp[17]; doscp_t *ret; - iconv_t *from; - iconv_t *to; + iconv_t from; + iconv_t to; if(codepage == 0) codepage = mtools_default_codepage; @@ -41,7 +41,7 @@ #define HAVE_GETOPT_H 1 /* Define to 1 if you have the `getpass' function. */ -#define HAVE_GETPASS 1 +/* #undef HAVE_GETPASS */ /* Define to 1 if you have the `gettimeofday' function. */ #define HAVE_GETTIMEOFDAY 1 |