summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-01-14 12:18:45 +0100
committerBram Moolenaar <Bram@vim.org>2014-01-14 12:18:45 +0100
commit9d1685d1cf21cf5c17a52ae8ea143161a0d00d37 (patch)
tree7f20404b6346a193b669e3d1db1ca0834d656291
parente21b6b2a8d526f22ece5ccadafa3a6ff3289d603 (diff)
downloadvim-git-9d1685d1cf21cf5c17a52ae8ea143161a0d00d37.tar.gz
updated for version 7.4.144v7.4.144
Problem: MingW also supports intptr_t for OPEN_OH_ARGTYPE. Solution: Adjust #ifdef. (Ken Takata)
-rw-r--r--src/os_mswin.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 4b2f3cf07..c7eab50d5 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -498,7 +498,7 @@ slash_adjust(p)
}
}
-#if (_MSC_VER >= 1300)
+#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__MINGW32__)
# define OPEN_OH_ARGTYPE intptr_t
#else
# define OPEN_OH_ARGTYPE long
diff --git a/src/version.c b/src/version.c
index c3281cafc..8ecdef609 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 */
/**/
+ 144,
+/**/
143,
/**/
142,