mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 11:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

build/MSVC: fix "C4005: RGB: macro redefinition"

Browse Source
This commit is contained in:
Justin M. Keyes
2018-03-18 14:07:34 +01:00
parent 26b84a8b3e
commit 65b66bc332
4 changed files with 688 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/macros.h
View File

@@ -145,10 +145,7 @@
#define ARRAY_SIZE(arr) ((sizeof(arr)/sizeof((arr)[0])) / ((size_t)(!(sizeof(arr) % sizeof((arr)[0]))))) #define ARRAY_SIZE(arr) ((sizeof(arr)/sizeof((arr)[0])) / ((size_t)(!(sizeof(arr) % sizeof((arr)[0])))))
// Duplicated in os/win_defs.h to avoid include-order sensitivity. // Duplicated in os/win_defs.h to avoid include-order sensitivity.
#if defined(WIN32) && defined(RGB) #define RGB_(r, g, b) ((r << 16) | (g << 8) | b)
# undef RGB
#endif
#define RGB(r, g, b) ((r << 16) | (g << 8) | b)
#define STR_(x) #x #define STR_(x) #x
#define STR(x) STR_(x) #define STR(x) STR_(x)

5
src/nvim/os/win_defs.h
View File

@@ -32,11 +32,8 @@
// Windows defines a RGB macro that produces 0x00bbggrr color values for use // Windows defines a RGB macro that produces 0x00bbggrr color values for use
// with GDI. Our macro is different, and we don't use GDI. // with GDI. Our macro is different, and we don't use GDI.
#if defined(RGB)
# undef RGB
// Duplicated from macros.h to avoid include-order sensitivity. // Duplicated from macros.h to avoid include-order sensitivity.
# define RGB(r, g, b) ((r << 16) | (g << 8) | b) #define RGB_(r, g, b) ((r << 16) | (g << 8) | b)
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
# ifndef inline # ifndef inline

1358
src/nvim/syntax.c
View File

File diff suppressed because it is too large Load Diff

11
src/nvim/terminal.c
View File

@@ -180,13 +180,14 @@ void terminal_init(void)
vterm_state_get_palette_color(state, color_index, &color); vterm_state_get_palette_color(state, color_index, &color);
} }
map_put(int, int)(color_indexes, map_put(int, int)(color_indexes,
RGB(color.red, color.green, color.blue), color_index + 1); RGB_(color.red, color.green, color.blue),
color_index + 1);
} }
VTermColor fg, bg; VTermColor fg, bg;
vterm_state_get_default_colors(state, &fg, &bg); vterm_state_get_default_colors(state, &fg, &bg);
default_vt_fg = RGB(fg.red, fg.green, fg.blue); default_vt_fg = RGB_(fg.red, fg.green, fg.blue);
default_vt_bg = RGB(bg.red, bg.green, bg.blue); default_vt_bg = RGB_(bg.red, bg.green, bg.blue);
default_vt_bg_rgb = bg; default_vt_bg_rgb = bg;
vterm_free(vt); vterm_free(vt);
} }
@@ -565,8 +566,8 @@ void terminal_get_line_attributes(Terminal *term, win_T *wp, int linenr,
VTermScreenCell cell; VTermScreenCell cell;
fetch_cell(term, row, col, &cell); fetch_cell(term, row, col, &cell);
// Get the rgb value set by libvterm. // Get the rgb value set by libvterm.
int vt_fg = RGB(cell.fg.red, cell.fg.green, cell.fg.blue); int vt_fg = RGB_(cell.fg.red, cell.fg.green, cell.fg.blue);
int vt_bg = RGB(cell.bg.red, cell.bg.green, cell.bg.blue); int vt_bg = RGB_(cell.bg.red, cell.bg.green, cell.bg.blue);
vt_fg = vt_fg != default_vt_fg ? vt_fg : - 1; vt_fg = vt_fg != default_vt_fg ? vt_fg : - 1;
vt_bg = vt_bg != default_vt_bg ? vt_bg : - 1; vt_bg = vt_bg != default_vt_bg ? vt_bg : - 1;
// Since libvterm does not expose the color index used by the program, we // Since libvterm does not expose the color index used by the program, we