diff --git a/src/macros.h b/src/macros.h
index b86c479e72..0f0a7d4258 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -331,7 +331,7 @@
 #  if defined(WIN32)
 #   ifndef isnan
 #    define isnan(x) _isnan(x)
-#    define isinf(x) (!_finite(x) && !_isnan(x))
+     static inline int isinf(double x) { return !_finite(x) && !_isnan(x); }
 #   endif
 #  else
 #   ifndef HAVE_ISNAN
diff --git a/src/version.c b/src/version.c
index ace7ff14c8..3623a099f8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1487,
 /**/
     1486,
 /**/