patch 7.4.2224

Problem:    Compiler warnings with older compiler and 64 bit numbers.
Solution:   Add "LL" to large values. (Mike Williams)

diff --git a/src/eval.c b/src/eval.c
index 2ab3ee4b90fd00f6bf815042aec15d1096a3d5c5..9b3f248b0e265fdeb3ecb449472911881e9da34d 100644 (file)
--- 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 b427ecf7e1cc4b3b739a14e2d465b325749917c9..53526300df0911921b91ab1c834a50efedb5ef60 100644 (file)
--- 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 a6c0ae3994ec49824150816364f3be204f2fdcdc..b047882a504a81ca003b81d1512ff2e6ea0e9f7f 100644 (file)
--- 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,
 /**/