5 files changed, 51 insertions, 21 deletions
diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c
index cf9ecd8d56..6074e4ee69 100644
--- a/src/nvim/eval/encode.c
+++ b/src/nvim/eval/encode.c
@@ -19,6 +19,7 @@
 #include "nvim/eval/typval.h"
 #include "nvim/garray.h"
 #include "nvim/mbyte.h"
+#include "nvim/math.h"
 #include "nvim/message.h"
 #include "nvim/memory.h"
 #include "nvim/charset.h"  // vim_isprintc()
diff --git a/src/nvim/macros.h b/src/nvim/macros.h
index 1d47520d8a..d447bff765 100644
--- a/src/nvim/macros.h
+++ b/src/nvim/macros.h
@@ -1,10 +1,6 @@
 #ifndef NVIM_MACROS_H
 #define NVIM_MACROS_H
 
-#include <math.h>
-
-#include "auto/config.h"
-
 // EXTERN is only defined in main.c. That's where global variables are
 // actually defined and initialized.
 #ifndef EXTERN
@@ -23,23 +19,6 @@
 # define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
 #endif
 
-#if defined(__clang__) && __clang__ == 1 && __clang_major__ >= 6 \
-    && defined(HAVE___FPCLASSIFY)
-// Workaround glibc + Clang 6+ bug. #8274
-// https://bugzilla.redhat.com/show_bug.cgi?id=1472437
-# define xfpclassify __fpclassify
-# define xisnan __isnan
-# define xisinf __isinf
-#elif defined(__MINGW32__)
-// Workaround mingw warning. #7863
-# define xfpclassify __fpclassify
-# define xisnan _isnan
-#else
-# define xfpclassify fpclassify
-# define xisnan isnan
-# define xisinf isinf
-#endif
-
 /// String with length
 ///
 /// For use in functions which accept (char *s, size_t len) pair in arguments.
diff --git a/src/nvim/math.c b/src/nvim/math.c
new file mode 100644
index 0000000000..b51f335ed7
--- /dev/null
+++ b/src/nvim/math.c
@@ -0,0 +1,42 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
+#include <math.h>
+
+#include "nvim/math.h"
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "math.c.generated.h"
+#endif
+
+#if defined(__clang__) && __clang__ == 1 && __clang_major__ >= 6
+// Workaround glibc + Clang 6+ bug. #8274
+// https://bugzilla.redhat.com/show_bug.cgi?id=1472437
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wconversion"
+#endif
+int xfpclassify(double d)
+{
+#if defined(__MINGW32__)
+  // Workaround mingw warning. #7863
+  return __fpclassify(d);
+#else
+  return fpclassify(d);
+#endif
+}
+int xisinf(double d)
+{
+  return isinf(d);
+}
+int xisnan(double d)
+{
+#if defined(__MINGW32__)
+  // Workaround mingw warning. #7863
+  return _isnan(d);
+#else
+  return isnan(d);
+#endif
+}
+#if defined(__clang__) && __clang__ == 1 && __clang_major__ >= 6
+# pragma clang diagnostic pop
+#endif
diff --git a/src/nvim/math.h b/src/nvim/math.h
new file mode 100644
index 0000000000..7969323905
--- /dev/null
+++ b/src/nvim/math.h
@@ -0,0 +1,7 @@
+#ifndef NVIM_MATH_H
+#define NVIM_MATH_H
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "math.h.generated.h"
+#endif
+#endif  // NVIM_MATH_H
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index 533784767c..96a8dfd295 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -27,6 +27,7 @@
 #include "nvim/func_attr.h"
 #include "nvim/getchar.h"
 #include "nvim/mark.h"
+#include "nvim/math.h"
 #include "nvim/mbyte.h"
 #include "nvim/memfile.h"
 #include "nvim/memline.h"