# HG changeset patch # User Christian Brabandt # Date 1511043304 -3600 # Node ID 5b3d0147711b5056aa1b31396a9881ddbcbf37e9 # Parent c460375c058e4bab6faf11da6b24a552b3ad4cb7 patch 8.0.1315: build still fails on Mac commit https://github.com/vim/vim/commit/e86ee877c1497890e64190c148ff59e8aaf10936 Author: Bram Moolenaar Date: Sat Nov 18 23:09:37 2017 +0100 patch 8.0.1315: build still fails on Mac Problem: Build still fails on Mac. (chdiza) Solution: Remove bogus typedef. diff --git a/src/os_macosx.m b/src/os_macosx.m --- 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 diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 1315, +/**/ 1314, /**/ 1313,