changeset 12877:5b3d0147711b v8.0.1315

patch 8.0.1315: build still fails on Mac commit https://github.com/vim/vim/commit/e86ee877c1497890e64190c148ff59e8aaf10936 Author: Bram Moolenaar <Bram@vim.org> 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.
author Christian Brabandt <cb@256bit.org>
date Sat, 18 Nov 2017 23:15:04 +0100
parents c460375c058e
children 634f09e9e506
files src/os_macosx.m src/version.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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>
--- 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,