summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/ruby/missing.h6
-rw-r--r--version.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index a3d7a6b7b7..4b88c9ea07 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -162,6 +162,8 @@ RUBY_EXTERN const union bytesequence4_or_float rb_nan;
# include <ieeefp.h>
# endif
# define isinf(x) (!finite(x) && !isnan(x))
+# elif defined(__cplusplus) && __cplusplus >= 201103L
+# include <cmath> // it must include constexpr bool isinf(double);
# else
RUBY_EXTERN int isinf(double);
# endif
@@ -170,7 +172,11 @@ RUBY_EXTERN int isinf(double);
#ifndef isnan
# ifndef HAVE_ISNAN
+# if defined(__cplusplus) && __cplusplus >= 201103L
+# include <cmath> // it must include constexpr bool isnan(double);
+# else
RUBY_EXTERN int isnan(double);
+# endif
# endif
#endif
diff --git a/version.h b/version.h
index 618add7773..9ab8d48f2e 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.2"
#define RUBY_RELEASE_DATE "2018-08-18"
-#define RUBY_PATCHLEVEL 76
+#define RUBY_PATCHLEVEL 77
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 8