updated for version 7.3.219

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

diff --git a/src/os_mac_conv.c b/src/os_mac_conv.c
index 3ede6480db3ae4f0c45af599753159f9559f4004..71960daa5d2f246586b43b186e3f1fa9dec7d14c 100644 (file)
--- 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>

diff --git a/src/os_macosx.m b/src/os_macosx.m
index 1d88e7dcd69f1914f044ca376d5c8d40b6bdd801..bc646677bf5f99e2a4a687d3ad7611e502fa30bb 100644 (file)
--- 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. */
 

diff --git a/src/version.c b/src/version.c
index 66b1fe9fe9fe8ed51ccb60cc3ba5fcad0e456d89..34b9f69132cbfb76c0e5e37378241c2540383910 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    219,
 /**/
     218,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 1f4f17b5f58069dec9129e4853331f40f13777be..a51834f728bc9831ea2c7c0900bb5550f2939086 100644 (file)
--- 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