Skip to content

Commit af9c4c9

Browse files
committed
patch 7.4.2224
Problem: Compiler warnings with older compiler and 64 bit numbers. Solution: Add "LL" to large values. (Mike Williams)
1 parent d3c907b commit af9c4c9

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

src/eval.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4087,11 +4087,11 @@ eval6(
40874087
{
40884088
#ifdef FEAT_NUM64
40894089
if (n1 == 0)
4090-
n1 = -0x7fffffffffffffff - 1; /* similar to NaN */
4090+
n1 = -0x7fffffffffffffffLL - 1; /* similar to NaN */
40914091
else if (n1 < 0)
4092-
n1 = -0x7fffffffffffffff;
4092+
n1 = -0x7fffffffffffffffLL;
40934093
else
4094-
n1 = 0x7fffffffffffffff;
4094+
n1 = 0x7fffffffffffffffLL;
40954095
#else
40964096
if (n1 == 0)
40974097
n1 = -0x7fffffffL - 1L; /* similar to NaN */

src/evalfunc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3291,10 +3291,10 @@ f_float2nr(typval_T *argvars, typval_T *rettv)
32913291
if (get_float_arg(argvars, &f) == OK)
32923292
{
32933293
# ifdef FEAT_NUM64
3294-
if (f < -0x7fffffffffffffff)
3295-
rettv->vval.v_number = -0x7fffffffffffffff;
3296-
else if (f > 0x7fffffffffffffff)
3297-
rettv->vval.v_number = 0x7fffffffffffffff;
3294+
if (f < -0x7fffffffffffffffLL)
3295+
rettv->vval.v_number = -0x7fffffffffffffffLL;
3296+
else if (f > 0x7fffffffffffffffLL)
3297+
rettv->vval.v_number = 0x7fffffffffffffffLL;
32983298
else
32993299
rettv->vval.v_number = (varnumber_T)f;
33003300
# else

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ static char *(features[]) =
763763

764764
static int included_patches[] =
765765
{ /* Add new patch number below this line */
766+
/**/
767+
2224,
766768
/**/
767769
2223,
768770
/**/

0 commit comments

Comments
 (0)