diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-03-18 16:47:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-18 16:47:25 +0100 |
| commit | 72e4c9d8e776790e40b2a5911bb702de897fbd12 (patch) | |
| tree | 06362caeb7fb916ced7202c5b71d0d5f3757a304 /src/nvim/macros.h | |
| parent | f407a94032ae7c3a78aa39c2de02e37d14a5f861 (diff) | |
| parent | 65b66bc332c56c04d4687f11b601a59ddd5d09bd (diff) | |
| download | rneovim-72e4c9d8e776790e40b2a5911bb702de897fbd12.tar.gz rneovim-72e4c9d8e776790e40b2a5911bb702de897fbd12.tar.bz2 rneovim-72e4c9d8e776790e40b2a5911bb702de897fbd12.zip | |
Merge #8142 'build/msvc: fix some warnings'
Diffstat (limited to 'src/nvim/macros.h')
| -rw-r--r-- | src/nvim/macros.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/nvim/macros.h b/src/nvim/macros.h index 61834c6499..4e01265498 100644 --- a/src/nvim/macros.h +++ b/src/nvim/macros.h @@ -145,10 +145,7 @@ #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. -#if defined(WIN32) && defined(RGB) -# undef RGB -#endif -#define RGB(r, g, b) ((r << 16) | (g << 8) | b) +#define RGB_(r, g, b) ((r << 16) | (g << 8) | b) #define STR_(x) #x #define STR(x) STR_(x) |