summaryrefslogtreecommitdiff
path: root/src/os_macosx.m
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-10-10 17:08:43 +0200
committerBram Moolenaar <Bram@vim.org>2010-10-10 17:08:43 +0200
commit423f97277ded9feef2bb3af660d414d764bc4fff (patch)
tree35b396321c82bb3007b47773e78493e954aacc71 /src/os_macosx.m
parent341ad7a6994f30f420411b01f3020a999a663f5f (diff)
downloadvim-git-423f97277ded9feef2bb3af660d414d764bc4fff.tar.gz
updated for version 7.3.021v7.3.021
Problem: Conflict for defining Boolean in Mac header files. Solution: Define NO_X11_INCLUDES. (Rainer Muller)
Diffstat (limited to 'src/os_macosx.m')
-rw-r--r--src/os_macosx.m4
1 files changed, 4 insertions, 0 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>