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: 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 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/os_macosx.m')

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>
 
-- 
cgit v1.2.3