diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-03-18 14:07:34 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-03-18 14:30:05 +0100 |
| commit | 65b66bc332c56c04d4687f11b601a59ddd5d09bd (patch) | |
| tree | 06362caeb7fb916ced7202c5b71d0d5f3757a304 /src/nvim/os | |
| parent | 26b84a8b3e99d9dce2ad9f34e1663f119cd1c558 (diff) | |
| download | rneovim-65b66bc332c56c04d4687f11b601a59ddd5d09bd.tar.gz rneovim-65b66bc332c56c04d4687f11b601a59ddd5d09bd.tar.bz2 rneovim-65b66bc332c56c04d4687f11b601a59ddd5d09bd.zip | |
build/MSVC: fix "C4005: RGB: macro redefinition"
Diffstat (limited to 'src/nvim/os')
| -rw-r--r-- | src/nvim/os/win_defs.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/nvim/os/win_defs.h b/src/nvim/os/win_defs.h index faee06304c..db93f016bf 100644 --- a/src/nvim/os/win_defs.h +++ b/src/nvim/os/win_defs.h @@ -32,11 +32,8 @@ // 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 +// Duplicated from macros.h to avoid include-order sensitivity. +#define RGB_(r, g, b) ((r << 16) | (g << 8) | b) #ifdef _MSC_VER # ifndef inline |