From 9a4d7fd214eada651030e303f28eef3b6c30178f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 13 Jun 2011 02:04:00 +0200 Subject: updated for version 7.3.219 Problem: Can't compile with GTK on Mac. Solution: Add some #ifdef trickery. (Ben Schmidt) --- src/os_macosx.m | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/os_macosx.m') diff --git a/src/os_macosx.m b/src/os_macosx.m index 1d88e7dcd..bc646677b 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 @@ -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. */ -- cgit v1.2.1