From 1e033f5594d9d702db427388f2d93b7357064df1 Mon Sep 17 00:00:00 2001
From: Kazuki Sakamoto <sakamoto@splhack.org>
Date: Sat, 30 Jul 2016 20:22:48 -0700
Subject: [PATCH] Revert "Fix to define FEAT_CLIPBOARD"

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

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