updated for version 7.3.021

Problem:    Conflict for defining Boolean in Mac header files.
Solution:   Define NO_X11_INCLUDES. (Rainer Muller)

diff --git a/src/os_macosx.m b/src/os_macosx.m
index 4ad8d26a80dbeac0b3c70155f7129ccd6f34879a..1d88e7dcd69f1914f044ca376d5c8d40b6bdd801 100644 (file)
--- 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 6d19c82cdb605b2e4c68506d5682bc5a8c90a13f..46e278d53bd714ebc17a7ce38a9daff85c9c8a9d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    21,
 /**/
     20,
 /**/

diff --git a/src/vim.h b/src/vim.h
index b9ce325539573dfcf76d6988643880f2534b9c0e..6c846c1d7e3991a8b3a7867799685e337bd69808 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -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