commit 423f97277ded9feef2bb3af660d414d764bc4fff
author Bram Moolenaar <Bram@vim.org> Sun Oct 10 17:08:43 2010 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Oct 10 17:08:43 2010 +0200
tree 35b396321c82bb3007b47773e78493e954aacc71
parent 341ad7a6994f30f420411b01f3020a999a663f5f

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

src/vim.h

diff --git a/src/vim.h b/src/vim.h
index b9ce325..6c846c1 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