commit e86ee877c1497890e64190c148ff59e8aaf10936
author Bram Moolenaar <Bram@vim.org> Sat Nov 18 23:09:37 2017 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Nov 18 23:09:37 2017 +0100
tree 78c56b589fd6344ad61fcaa58742569074a89a53
parent 4ab9d9e9a41f441d7d96f51fec2213d412ea64e7

patch 8.0.1315: build still fails on Mac

Problem:    Build still fails on Mac. (chdiza)
Solution:   Remove bogus typedef.

src/os_macosx.m

diff --git a/src/os_macosx.m b/src/os_macosx.m
index 029f103..6fd72fd 100644
--- a/src/os_macosx.m
+++ b/src/os_macosx.m
@@ -14,7 +14,6 @@
 /* Avoid a conflict for the definition of Boolean between Mac header files and
  * X11 header files. */
 #define NO_X11_INCLUDES
-#define BalloonEval int   /* used in header files */
 
 #include "vim.h"
 #import <AppKit/AppKit.h>

src/version.c

diff --git a/src/version.c b/src/version.c
index 202d21d..163ae8e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1315,
+/**/
     1314,
 /**/
     1313,