From 423f97277ded9feef2bb3af660d414d764bc4fff Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 10 Oct 2010 17:08:43 +0200
Subject: [PATCH] updated for version 7.3.021 Problem:    Conflict for defining
 Boolean in Mac header files. Solution:   Define NO_X11_INCLUDES. (Rainer
 Muller)

---
 src/os_macosx.m | 4 ++++
 src/version.c   | 2 ++
 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
@@ -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 b9ce32553..6c846c1d7 100644
--- 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