From 4033c55eca575777718c0701e26635a0cc47d907 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 16 Sep 2017 20:54:51 +0200 Subject: patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs Problem: FEAT_WINDOWS adds a lot of #ifdefs while it is nearly always enabled and only adds 7% to the binary size of the tiny build. Solution: Graduate FEAT_WINDOWS. --- src/vim.h | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'src/vim.h') diff --git a/src/vim.h b/src/vim.h index cbab10190..f497cbccd 100644 --- a/src/vim.h +++ b/src/vim.h @@ -859,24 +859,12 @@ extern int (*dyn_libintl_putenv)(const char *envstring); #define FINDFILE_DIR 1 /* only directories */ #define FINDFILE_BOTH 2 /* files and directories */ -#ifdef FEAT_WINDOWS -# define W_WINCOL(wp) (wp->w_wincol) -# define W_WIDTH(wp) (wp->w_width) -# define W_ENDCOL(wp) (wp->w_wincol + wp->w_width) -# define W_VSEP_WIDTH(wp) (wp->w_vsep_width) -#else -# define W_WINCOL(wp) 0 -# define W_WIDTH(wp) Columns -# define W_ENDCOL(wp) Columns -# define W_VSEP_WIDTH(wp) 0 -#endif -#ifdef FEAT_WINDOWS -# define W_STATUS_HEIGHT(wp) (wp->w_status_height) -# define W_WINROW(wp) (wp->w_winrow) -#else -# define W_STATUS_HEIGHT(wp) 0 -# define W_WINROW(wp) 0 -#endif +#define W_WINCOL(wp) (wp->w_wincol) +#define W_WIDTH(wp) (wp->w_width) +#define W_ENDCOL(wp) (wp->w_wincol + wp->w_width) +#define W_VSEP_WIDTH(wp) (wp->w_vsep_width) +#define W_STATUS_HEIGHT(wp) (wp->w_status_height) +#define W_WINROW(wp) (wp->w_winrow) #ifdef NO_EXPANDPATH # define gen_expand_wildcards mch_expand_wildcards -- cgit v1.2.1