summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-03-12 14:54:34 +0100
committerBram Moolenaar <Bram@vim.org>2014-03-12 14:54:34 +0100
commit4064e24a0f7581b47dcc9de9e24891d295d4f6e2 (patch)
tree38e9f45e97a3e4dd1c10f3d251281101f0e6120c
parent0858917e435af762a32e694eeab710c399a74c24 (diff)
downloadvim-git-4064e24a0f7581b47dcc9de9e24891d295d4f6e2.tar.gz
updated for version 7.4.194v7.4.194
Problem: Can't build for Android. Solution: Add #if condition. (Fredrik Fornwall)
-rw-r--r--src/mbyte.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mbyte.c b/src/mbyte.c
index cb14a25fa..10df894be 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -708,7 +708,7 @@ codepage_invalid:
* API */
n = IsDBCSLeadByteEx(enc_dbcs, (WINBYTE)i) ? 2 : 1;
#else
-# if defined(MACOS) || defined(__amigaos4__)
+# if defined(MACOS) || defined(__amigaos4__) || defined(__ANDROID__)
/*
* if mblen() is not available, character which MSB is turned on
* are treated as leading byte character. (note : This assumption
diff --git a/src/version.c b/src/version.c
index c3776acaf..4b213685c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 194,
+/**/
193,
/**/
192,