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 2ab3ee4..9b3f248 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -4087,11 +4087,11 @@
{
#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 b427ecf..5352630 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -3291,10 +3291,10 @@
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 a6c0ae3..b047882 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2224,
+/**/
2223,
/**/
2222,