aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Reed <Pyrohh@users.noreply.github.com>2016-01-14 22:58:31 -0500
committerMichael Reed <Pyrohh@users.noreply.github.com>2016-01-14 22:58:31 -0500
commit65394777d51cb8f5a81bc241ab031b83d12549d9 (patch)
treeff5fb8968bf4136f804a606e0989197995dcc976
parent964e52e81f25db64471b37252651c0da89d41d5a (diff)
parent755e56ba66cec39912331753de9367d7fa0f35d6 (diff)
downloadrneovim-65394777d51cb8f5a81bc241ab031b83d12549d9.tar.gz
rneovim-65394777d51cb8f5a81bc241ab031b83d12549d9.tar.bz2
rneovim-65394777d51cb8f5a81bc241ab031b83d12549d9.zip
Merge pull request #4017 from sethjackson/rgb
[RFC] Windows: Undefine the Windows RGB macro
-rw-r--r--src/nvim/os/win_defs.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nvim/os/win_defs.h b/src/nvim/os/win_defs.h
index e6a714601f..673fff3ad0 100644
--- a/src/nvim/os/win_defs.h
+++ b/src/nvim/os/win_defs.h
@@ -17,6 +17,9 @@
#define USE_CRNL
+// We have our own RGB macro in macros.h.
+#undef RGB
+
#ifdef _MSC_VER
# ifndef inline
# define inline __inline