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
commit47fdbac77ab093e2280c4656f432102205dd323f (patch)
treed75dbb99a3213661aba84ac8c38f8b7036a60f08
parent202c5fcf583efecd442739b67524c9887aeacdbf (diff)
downloadvim-47fdbac77ab093e2280c4656f432102205dd323f.tar.gz
updated for version 7.4.056v7.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 cc026534..80459c94 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 184aee76..c6825089 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,