Fix build error

- Add the declaration for gui_mch_menu_set_tip in proto
- On prior to 10.12 comment out the declarations of touchbar methods

Author: ichizok

src/MacVim/MMVimController.m

@@ -37,13 +37,13 @@
 #import "MMWindow.h"
 
 
-static NSString *MMDefaultToolbarImageName = @"Attention";
+static NSString * const MMDefaultToolbarImageName = @"Attention";
 static int MMAlertTextFieldHeight = 22;
 
-static const NSString * const MMToolbarMenuName = @"ToolBar";
-static const NSString * const MMTouchbarMenuName = @"TouchBar";
-static const NSString * const MMPopUpMenuPrefix = @"PopUp";
-static const NSString * const MMUserPopUpMenuPrefix = @"]";
+static NSString * const MMToolbarMenuName = @"ToolBar";
+static NSString * const MMTouchbarMenuName = @"TouchBar";
+static NSString * const MMPopUpMenuPrefix = @"PopUp";
+static NSString * const MMUserPopUpMenuPrefix = @"]";
 
 // NOTE: By default a message sent to the backend will be dropped if it cannot
 // be delivered instantly; otherwise there is a possibility that MacVim will
@@ -138,6 +138,7 @@ - (void)addToolbarItemToDictionaryWithLabel:(NSString *)title
 - (void)addToolbarItemWithLabel:(NSString *)label
                           tip:(NSString *)tip icon:(NSString *)icon
                       atIndex:(int)idx;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12_2
 - (void)addTouchbarItemWithLabel:(NSString *)label
                             icon:(NSString *)icon
                              tip:(NSString *)tip
@@ -151,6 +152,7 @@ - (void)updateTouchbarItemLabel:(NSString *)label
 - (BOOL)touchBarItemForDescriptor:(NSArray *)desc
                          touchBar:(MMTouchBarInfo **)touchBarPtr
                      touchBarItem:(MMTouchBarItemInfo **)touchBarItemPtr;
+#endif
 - (void)popupMenuWithDescriptor:(NSArray *)desc
                           atRow:(NSNumber *)row
                          column:(NSNumber *)col;
@@ -1109,10 +1111,12 @@ - (void)alertDidEnd:(MMAlert *)alert code:(int)code context:(void *)context
                 pid, identifier, ex);
     }
 }
+
 + (bool) hasPopupPrefix: (NSString *) menuName
 {
     return [menuName hasPrefix:MMPopUpMenuPrefix] || [menuName hasPrefix:MMUserPopUpMenuPrefix];
 }
+
 - (NSMenuItem *)menuItemForDescriptor:(NSArray *)desc
 {
     if (!(desc && [desc count] > 0)) return nil;

src/menu.c

@@ -814,7 +814,7 @@ add_menu_path(
 	    }
 	}
 #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_MSWIN) \
-	&& (defined(FEAT_BEVAL_GUI) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MACVIM))
+	&& (defined(FEAT_BEVAL_GUI) || defined(FEAT_GUI_GTK))
 	// Need to update the menu tip.
 	if (modes & MENU_TIP_MODE)
 	    gui_mch_menu_set_tip(menu);
@@ -1009,7 +1009,7 @@ remove_menu(
 	{
 	    free_menu_string(menu, MENU_INDEX_TIP);
 #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_MSWIN) \
-	    && (defined(FEAT_BEVAL_GUI) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MACVIM))
+	    && (defined(FEAT_BEVAL_GUI) || defined(FEAT_GUI_GTK))
 	    // Need to update the menu tip.
 	    if (gui.in_use)
 		gui_mch_menu_set_tip(menu);

src/proto/gui_macvim.pro

@@ -30,6 +30,7 @@ void gui_mch_destroy_menu(vimmenu_T *menu);
 void gui_mch_menu_grey(vimmenu_T *menu, int grey);
 void gui_mch_menu_hidden(vimmenu_T *menu, int hidden);
 void gui_mch_show_popupmenu(vimmenu_T *menu);
+void gui_mch_menu_set_tip(vimmenu_T *menu);
 void gui_mch_draw_menubar(void);
 void gui_mch_enable_menu(int flag);
 void gui_mch_show_toolbar(int showit);