From 01f1fdeb6790f9a1b843dabb43bd35e0a4ee8b47 Mon Sep 17 00:00:00 2001
From: Kazuki Sakamoto <sakamoto@splhack.org>
Date: Fri, 29 Jul 2016 22:01:14 -0700
Subject: [PATCH] Fix to define FEAT_CLIPBOARD

---
 src/os_macosx.m | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/os_macosx.m b/src/os_macosx.m
index d5d0cfe1e2..af3d275e7c 100644
--- a/src/os_macosx.m
+++ b/src/os_macosx.m
@@ -15,10 +15,12 @@
     Error: MACOS 9 is no longer supported in Vim 7
 #endif
 
+#ifndef FEAT_GUI_MACVIM
 /* 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 */
+# define NO_X11_INCLUDES
+# define BalloonEval int   /* used in header files */
+#endif
 
 #include "vim.h"
 #import <Cocoa/Cocoa.h>