Mercurial > vim
changeset 2891:acda456c788a v7.3.219
updated for version 7.3.219
Problem: Can't compile with GTK on Mac.
Solution: Add some #ifdef trickery. (Ben Schmidt)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Mon, 13 Jun 2011 02:04:00 +0200 |
parents | 17bdc73daed7 |
children | 77ab914d3c59 |
files | src/os_mac_conv.c src/os_macosx.m src/version.c src/vim.h |
diffstat | 4 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- 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. */