commit 9a4d7fd214eada651030e303f28eef3b6c30178f
author Bram Moolenaar <Bram@vim.org> Mon Jun 13 02:04:00 2011 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Jun 13 02:04:00 2011 +0200
tree 754fbc1118c8943c8a102ef391128b6eff4e066d
parent 015de43f70cca1d5e3e0798b9312f7200bdcc300

updated for version 7.3.219
Problem:    Can't compile with GTK on Mac.
Solution:   Add some #ifdef trickery. (Ben Schmidt)

src/os_mac_conv.c

diff --git a/src/os_mac_conv.c b/src/os_mac_conv.c
index 3ede648..71960da 100644
--- a/src/os_mac_conv.c
+++ b/src/os_mac_conv.c
@@ -14,6 +14,8 @@
  */
 
 #define NO_X11_INCLUDES
+#define BalloonEval int   /* used in header files */
+
 #include "vim.h"
 #ifndef FEAT_GUI_MAC
 # include <CoreServices/CoreServices.h>

src/os_macosx.m

diff --git a/src/os_macosx.m b/src/os_macosx.m
index 1d88e7d..bc64667 100644
--- a/src/os_macosx.m
+++ b/src/os_macosx.m
@@ -18,6 +18,7 @@
 /* Avoid a conflict for the definition of Boolean between Mac header files and
  * X11 header files. */
 #define NO_X11_INCLUDES
+#define BalloonEval int   /* used in header files */
 
 #include "vim.h"
 #import <Cocoa/Cocoa.h>
@@ -27,9 +28,9 @@
  * Clipboard support for the console.
  * Don't include this when building the GUI version, the functions in
  * gui_mac.c are used then.  TODO: remove those instead?
- * But for MacVim we need these ones.
+ * But for MacVim we do need these ones.
  */
-#if defined(FEAT_CLIPBOARD) && (!defined(FEAT_GUI) || defined(FEAT_GUI_MACVIM))
+#if defined(FEAT_CLIPBOARD) && (!defined(FEAT_GUI_ENABLED) || defined(FEAT_GUI_MACVIM))
 
 /* Used to identify clipboard data copied from Vim. */
 

src/version.c

diff --git a/src/version.c b/src/version.c
index 66b1fe9..34b9f69 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    219,
+/**/
     218,
 /**/
     217,

src/vim.h

diff --git a/src/vim.h b/src/vim.h
index 1f4f17b..a51834f 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -121,6 +121,7 @@
     || defined(FEAT_GUI_W32) \
     || defined(FEAT_GUI_W16) \
     || defined(FEAT_GUI_PHOTON)
+# define FEAT_GUI_ENABLED  /* also defined with NO_X11_INCLUDES */
 # if !defined(FEAT_GUI) && !defined(NO_X11_INCLUDES)
 #  define FEAT_GUI
 # endif