From 9a4d7fd214eada651030e303f28eef3b6c30178f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 13 Jun 2011 02:04:00 +0200
Subject: [PATCH] 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 | 2 ++
src/os_macosx.m | 5 +++--
src/version.c | 2 ++
src/vim.h | 1 +
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/os_mac_conv.c b/src/os_mac_conv.c
index 3ede6480db..71960daa5d 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>
diff --git a/src/os_macosx.m b/src/os_macosx.m
index 1d88e7dcd6..bc646677bf 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. */
diff --git a/src/version.c b/src/version.c
index 66b1fe9fe9..34b9f69132 100644
--- 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 1f4f17b5f5..a51834f728 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
--
GitLab