diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_macosx.m | 4 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim.h | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/os_macosx.m b/src/os_macosx.m index 4ad8d26a8..1d88e7dcd 100644 --- a/src/os_macosx.m +++ b/src/os_macosx.m @@ -15,6 +15,10 @@ Error: MACOS 9 is no longer supported in Vim 7 #endif +/* Avoid a conflict for the definition of Boolean between Mac header files and + * X11 header files. */ +#define NO_X11_INCLUDES + #include "vim.h" #import <Cocoa/Cocoa.h> diff --git a/src/version.c b/src/version.c index 6d19c82cd..46e278d53 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 21, +/**/ 20, /**/ 19, @@ -192,8 +192,8 @@ #endif #ifdef NO_X11_INCLUDES - /* In os_mac_conv.c NO_X11_INCLUDES is defined to avoid X11 headers. - * Disable all X11 related things to avoid conflicts. */ + /* In os_mac_conv.c and os_macosx.m NO_X11_INCLUDES is defined to avoid + * X11 headers. Disable all X11 related things to avoid conflicts. */ # ifdef FEAT_X11 # undef FEAT_X11 # endif |