summaryrefslogtreecommitdiff
path: root/src/os_macosx.m
diff options
context:
space:
mode:
Diffstat (limited to 'src/os_macosx.m')
-rw-r--r--src/os_macosx.m5
1 files changed, 3 insertions, 2 deletions
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 <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. */