diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 1 | ||||
| -rw-r--r-- | src/nvim/menu.c | 6 | ||||
| -rw-r--r-- | src/nvim/vim.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index b43ab238cd..40727cf68b 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -9937,7 +9937,6 @@ static void f_has(typval_T *argvars, typval_T *rettv) "arabic", "autocmd", #if defined(FEAT_BROWSE) && (defined(USE_FILE_CHOOSER) \ - || defined(FEAT_GUI_W32) \ || defined(FEAT_GUI_MOTIF)) "browsefilter", #endif diff --git a/src/nvim/menu.c b/src/nvim/menu.c index 06351581ea..4e5d554866 100644 --- a/src/nvim/menu.c +++ b/src/nvim/menu.c @@ -460,7 +460,7 @@ add_menu_path ( menu->silent[i] = menuarg->silent[0]; } } -#if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) \ +#if defined(FEAT_TOOLBAR) \ && (defined(FEAT_BEVAL) || defined(FEAT_GUI_GTK)) /* Need to update the menu tip. */ if (modes & MENU_TIP_MODE) @@ -613,8 +613,8 @@ remove_menu ( menu->modes |= child->modes; if (modes & MENU_TIP_MODE) { free_menu_string(menu, MENU_INDEX_TIP); -#if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) \ - && (defined(FEAT_BEVAL) || defined(FEAT_GUI_GTK)) +#if defined(FEAT_TOOLBAR) && \ + (defined(FEAT_BEVAL) || defined(FEAT_GUI_GTK)) /* Need to update the menu tip. */ if (gui.in_use) gui_mch_menu_set_tip(menu); diff --git a/src/nvim/vim.h b/src/nvim/vim.h index c88a8872f3..e9606a7294 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -338,7 +338,7 @@ enum { * functions of these names. The declarations would break if the defines had * been seen at that stage. But it must be before globals.h, where error_ga * is declared. */ -#if !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_X11) \ +#if !defined(FEAT_GUI_X11) \ && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MAC) # define mch_errmsg(str) fprintf(stderr, "%s", (str)) # define display_errors() fflush(stderr) |