summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-11-02 21:49:32 +0100
committerBram Moolenaar <Bram@vim.org>2013-11-02 21:49:32 +0100
commit4cc95d1495706593d30ce2fae3fc592a2ffdaab8 (patch)
tree5ec50c25f0bae57a4d55ca83813a42765a0d42d8
parent2b1b53f5d9674c6fc41eab86178e3dcfd948d297 (diff)
downloadvim-git-4cc95d1495706593d30ce2fae3fc592a2ffdaab8.tar.gz
updated for version 7.4.056v7.4.056
Problem: Mac: Compilation problem with OS X 10.9 Mavericks. Solution: Include AvailabilityMacros.h when available. (Kazunobu Kuriyama)
-rw-r--r--src/os_unix.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index cc026534d..80459c94e 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -804,6 +804,12 @@ mch_stackcheck(p)
* completely full.
*/
+#if defined(HAVE_AVAILABILITYMACROS_H) \
+ && defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) \
+ && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1090)
+# include <AvailabilityMacros.h>
+#endif
+
#ifndef SIGSTKSZ
# define SIGSTKSZ 8000 /* just a guess of how much stack is needed... */
#endif
diff --git a/src/version.c b/src/version.c
index 184aee76d..c68250893 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 */
/**/
+ 56,
+/**/
55,
/**/
54,