Mercurial > vim

diff src/os_macosx.m @ 2598:10ce04af8c5b v7.3.021

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.021 Problem: Conflict for defining Boolean in Mac header files. Solution: Define NO_X11_INCLUDES. (Rainer Muller)
author Bram Moolenaar <bram@vim.org>
date Sun, 10 Oct 2010 17:08:43 +0200
parents 6931da037310
children acda456c788a
line wrap: on
line diff
--- 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>