diff --git a/src/eval.c b/src/eval.c
index 2ab3ee4b90..9b3f248b0e 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -4087,11 +4087,11 @@ eval6(
 		    {
 #ifdef FEAT_NUM64
 			if (n1 == 0)
-			    n1 = -0x7fffffffffffffff - 1; /* similar to NaN */
+			    n1 = -0x7fffffffffffffffLL - 1; /* similar to NaN */
 			else if (n1 < 0)
-			    n1 = -0x7fffffffffffffff;
+			    n1 = -0x7fffffffffffffffLL;
 			else
-			    n1 = 0x7fffffffffffffff;
+			    n1 = 0x7fffffffffffffffLL;
 #else
 			if (n1 == 0)
 			    n1 = -0x7fffffffL - 1L;	/* similar to NaN */
diff --git a/src/evalfunc.c b/src/evalfunc.c
index b427ecf7e1..53526300df 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -3291,10 +3291,10 @@ f_float2nr(typval_T *argvars, typval_T *rettv)
     if (get_float_arg(argvars, &f) == OK)
     {
 # ifdef FEAT_NUM64
-	if (f < -0x7fffffffffffffff)
-	    rettv->vval.v_number = -0x7fffffffffffffff;
-	else if (f > 0x7fffffffffffffff)
-	    rettv->vval.v_number = 0x7fffffffffffffff;
+	if (f < -0x7fffffffffffffffLL)
+	    rettv->vval.v_number = -0x7fffffffffffffffLL;
+	else if (f > 0x7fffffffffffffffLL)
+	    rettv->vval.v_number = 0x7fffffffffffffffLL;
 	else
 	    rettv->vval.v_number = (varnumber_T)f;
 # else
diff --git a/src/version.c b/src/version.c
index a6c0ae3994..b047882a50 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2224,
 /**/
     2223,
 /**/