diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-18 23:09:37 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-18 23:09:37 +0100 |
| commit | e86ee877c1497890e64190c148ff59e8aaf10936 (patch) | |
| tree | 78c56b589fd6344ad61fcaa58742569074a89a53 | |
| parent | 4ab9d9e9a41f441d7d96f51fec2213d412ea64e7 (diff) | |
patch 8.0.1315: build still fails on Macv8.0.1315
Problem: Build still fails on Mac. (chdiza)
Solution: Remove bogus typedef.
| -rw-r--r-- | src/os_macosx.m | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/os_macosx.m b/src/os_macosx.m index 029f103b1a..6fd72fd280 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> diff --git a/src/version.c b/src/version.c index 202d21d3b3..163ae8e34a 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 */ /**/ + 1315, +/**/ 1314, /**/ 1313, |