From 031758ad5c2422ddf68bfe747baa922f11418c52 Mon Sep 17 00:00:00 2001 From: Hettomei Date: Fri, 8 May 2015 13:02:05 +0200 Subject: Macro cleanup: FEAT_GUI_W32 --- src/nvim/vim.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/vim.h') 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) -- cgit From bd819aaed0f72b43b553ba5b5e34df7fcb3f600c Mon Sep 17 00:00:00 2001 From: Hettomei Date: Fri, 8 May 2015 14:40:10 +0200 Subject: Macro cleanup: FEAT_GUI_GTK --- src/nvim/vim.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/nvim/vim.h') diff --git a/src/nvim/vim.h b/src/nvim/vim.h index e9606a7294..5e424f5375 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -338,8 +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_X11) \ - && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MAC) +#if !defined(FEAT_GUI_X11) && !defined(FEAT_GUI_MAC) # define mch_errmsg(str) fprintf(stderr, "%s", (str)) # define display_errors() fflush(stderr) # define mch_msg(str) printf("%s", (str)) -- cgit From db9bcadb0585b1a94031350263d185e7974bf0b1 Mon Sep 17 00:00:00 2001 From: Hettomei Date: Fri, 8 May 2015 14:41:02 +0200 Subject: Macro cleanup: FEAT_GUI_X11 --- src/nvim/vim.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/vim.h') diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 5e424f5375..446d1e0265 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_X11) && !defined(FEAT_GUI_MAC) +#if !defined(FEAT_GUI_MAC) # define mch_errmsg(str) fprintf(stderr, "%s", (str)) # define display_errors() fflush(stderr) # define mch_msg(str) printf("%s", (str)) -- cgit From 9b58fc69860406b42b86546138f4dae14190ea63 Mon Sep 17 00:00:00 2001 From: Hettomei Date: Fri, 8 May 2015 14:42:59 +0200 Subject: Macro cleanup: FEAT_GUI_MAC --- src/nvim/vim.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/nvim/vim.h') diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 446d1e0265..17f9cbc310 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -332,19 +332,15 @@ enum { /* Maximum number of bytes in a multi-byte character. It can be one 32-bit * character of up to 6 bytes, or one 16-bit character of up to three bytes * plus six following composing characters of three bytes each. */ -# define MB_MAXBYTES 21 +#define MB_MAXBYTES 21 /* This has to go after the include of proto.h, as proto/gui.pro declares * 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_MAC) -# define mch_errmsg(str) fprintf(stderr, "%s", (str)) -# define display_errors() fflush(stderr) -# define mch_msg(str) printf("%s", (str)) -#else -# define USE_MCH_ERRMSG -#endif +#define mch_errmsg(str) fprintf(stderr, "%s", (str)) +#define display_errors() fflush(stderr) +#define mch_msg(str) printf("%s", (str)) #include "nvim/globals.h" /* global variables and messages */ #include "nvim/buffer_defs.h" /* buffer and windows */ -- cgit