aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2015-12-31 00:16:07 -0500
committerJustin M. Keyes <justinkz@gmail.com>2015-12-31 00:16:07 -0500
commit68fb815bf171699312e72650b5008ba59dafcf9b (patch)
tree9c2925aa5151cbcfd149465d2cffcbe46329bebc
parent8b3c399b6d7f4a277d80da4b29349fed944f7d46 (diff)
parentc5d0c280d3d2bfa9e675ed6a4e3d8779c9f39977 (diff)
downloadrneovim-68fb815bf171699312e72650b5008ba59dafcf9b.tar.gz
rneovim-68fb815bf171699312e72650b5008ba59dafcf9b.tar.bz2
rneovim-68fb815bf171699312e72650b5008ba59dafcf9b.zip
Merge pull request #3881 from sethjackson/msvc-ui-call
MSVC: Fix UI_CALL for MSVC
-rw-r--r--src/nvim/ui.c27
1 files changed, 19 insertions, 8 deletions
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 786f6026de..d32969f149 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -55,14 +55,25 @@ static int height, width;
//
// See http://stackoverflow.com/a/11172679 for a better explanation of how it
// works.
-#define UI_CALL(...) \
- do { \
- flush_cursor_update(); \
- for (size_t i = 0; i < ui_count; i++) { \
- UI *ui = uis[i]; \
- UI_CALL_HELPER(CNT(__VA_ARGS__), __VA_ARGS__); \
- } \
- } while (0)
+#ifdef _MSC_VER
+ #define UI_CALL(funname, ...) \
+ do { \
+ flush_cursor_update(); \
+ for (size_t i = 0; i < ui_count; i++) { \
+ UI *ui = uis[i]; \
+ UI_CALL_MORE(funname, __VA_ARGS__); \
+ } \
+ } while (0)
+#else
+ #define UI_CALL(...) \
+ do { \
+ flush_cursor_update(); \
+ for (size_t i = 0; i < ui_count; i++) { \
+ UI *ui = uis[i]; \
+ UI_CALL_HELPER(CNT(__VA_ARGS__), __VA_ARGS__); \
+ } \
+ } while (0)
+#endif
#define CNT(...) SELECT_NTH(__VA_ARGS__, MORE, MORE, MORE, MORE, ZERO, ignore)
#define SELECT_NTH(a1, a2, a3, a4, a5, a6, ...) a6
#define UI_CALL_HELPER(c, ...) UI_CALL_HELPER2(c, __VA_ARGS__)