summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-11-18 23:23:01 +0100
committerBram Moolenaar <Bram@vim.org>2017-11-18 23:23:01 +0100
commit44c2bffde74a98acdc60505e57c70cd7cc2afa1e (patch)
treee7b38e0ef3abdf0972a7b076a1ca66ca341f10d9 /src
parente86ee877c1497890e64190c148ff59e8aaf10936 (diff)
downloadvim-git-44c2bffde74a98acdc60505e57c70cd7cc2afa1e.tar.gz
patch 8.0.1316: build still still fails on Macv8.0.1316
Problem: Build still still fails on Mac. (chdiza) Solution: Remove another bogus typedef.
Diffstat (limited to 'src')
-rw-r--r--src/os_mac_conv.c1
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/os_mac_conv.c b/src/os_mac_conv.c
index ad2d58dcb..1fddc61f3 100644
--- a/src/os_mac_conv.c
+++ b/src/os_mac_conv.c
@@ -14,7 +14,6 @@
*/
#define NO_X11_INCLUDES
-typedef int BalloonEval; /* used in header files */
#include "vim.h"
diff --git a/src/version.c b/src/version.c
index 163ae8e34..99007ac5c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1316,
+/**/
1315,
/**/
1314,