aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorb-r-o-c-k <brockmammen@gmail.com>2018-03-04 17:44:23 -0600
committerb-r-o-c-k <brockmammen@gmail.com>2018-03-04 17:44:23 -0600
commitd7ee3233264626de93e0466e0abecbc9dc6bc6ba (patch)
tree42d161c501c951c08c79cdc649dcb26d5d6f506b
parent773f23e00d5a4af836a854702ffb9e69fcaf61ff (diff)
downloadrneovim-d7ee3233264626de93e0466e0abecbc9dc6bc6ba.tar.gz
rneovim-d7ee3233264626de93e0466e0abecbc9dc6bc6ba.tar.bz2
rneovim-d7ee3233264626de93e0466e0abecbc9dc6bc6ba.zip
build/msvc: Fix errors caused by compiler intrinsics
-rw-r--r--src/nvim/eval.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 923b4527c2..d69acf4eef 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -5936,6 +5936,14 @@ static int get_env_tv(char_u **arg, typval_T *rettv, int evaluate)
}
#ifdef INCLUDE_GENERATED_DECLARATIONS
+
+#ifdef _MSC_VER
+// This prevents MSVC from replacing the functions with intrinsics,
+// and causing errors when trying to get their addresses in funcs.generated.h
+#pragma function (ceil)
+#pragma function (floor)
+#endif
+
# include "funcs.generated.h"
#endif