diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-08-06 04:25:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-06 04:25:55 +0200 |
| commit | 5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd (patch) | |
| tree | fc61484a30532ef89f24c5b60534dccc56408d17 /src/nvim/os | |
| parent | 55c0401dfd137a5e173d8551f763cb4c6fed56e1 (diff) | |
| parent | 3827d5bc713d9ed149bc793f411debb5b89a4eba (diff) | |
| download | rneovim-5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd.tar.gz rneovim-5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd.tar.bz2 rneovim-5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd.zip | |
Merge #7110 from justinmk/preserve-wildmenu
Diffstat (limited to 'src/nvim/os')
| -rw-r--r-- | src/nvim/os/win_defs.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/nvim/os/win_defs.h b/src/nvim/os/win_defs.h index 7ed70f6092..8fd2e51f8b 100644 --- a/src/nvim/os/win_defs.h +++ b/src/nvim/os/win_defs.h @@ -30,8 +30,13 @@ #define USE_CRNL -// We have our own RGB macro in macros.h. -#undef RGB +// Windows defines a RGB macro that produces 0x00bbggrr color values for use +// 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. +# define RGB(r, g, b) ((r << 16) | (g << 8) | b) +#endif #ifdef _MSC_VER # ifndef inline |