1 files changed, 8 insertions, 3 deletions
diff --git a/marshal.c b/marshal.c
index a7eb3edc8a..c6c3922283 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1678,13 +1678,18 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
 	    const char *ptr = RSTRING_PTR(str);
 
 	    if (strcmp(ptr, "nan") == 0) {
-		d = NAN;
+		d =
+#ifdef HAVE_NANF
+		    nan("");
+#else
+		    (double)NAN;
+#endif
 	    }
 	    else if (strcmp(ptr, "inf") == 0) {
-		d = INFINITY;
+		d = HUGE_VAL;
 	    }
 	    else if (strcmp(ptr, "-inf") == 0) {
-		d = -INFINITY;
+		d = -HUGE_VAL;
 	    }
 	    else {
 		char *e;