diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-08-07 07:51:03 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-08-07 07:51:03 +0800 |
| commit | 8b4dc955b7384180c1ae0eab6050bbf4e17c7673 (patch) | |
| tree | 32508d91df7b98baeae52288b8cf0aa08b40b80a /src/nvim/os | |
| parent | c972efc9d113232b2688ea5c2adc8834a4eda195 (diff) | |
| parent | 2753d61e4cb037323d78ed3fd978a10694c902c6 (diff) | |
| download | rneovim-8b4dc955b7384180c1ae0eab6050bbf4e17c7673.tar.gz rneovim-8b4dc955b7384180c1ae0eab6050bbf4e17c7673.tar.bz2 rneovim-8b4dc955b7384180c1ae0eab6050bbf4e17c7673.zip | |
Merge remote-tracking branch 'upstream/master'
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 |