diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-17 21:51:56 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-17 21:51:56 +0200 |
| commit | af9c4c9b5761c4c074237d87e2c95713bf721eab (patch) | |
| tree | ef285eba880631e886b995429cbeff7baa153cae | |
| parent | d3c907b5d2b352482b580a0cf687cbbea4c19ea1 (diff) | |
patch 7.4.2224v7.4.2224
Problem: Compiler warnings with older compiler and 64 bit numbers.
Solution: Add "LL" to large values. (Mike Williams)
| -rw-r--r-- | src/eval.c | 6 | ||||
| -rw-r--r-- | src/evalfunc.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 7 deletions
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 @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2224, +/**/ 2223, /**/ 2222, |