# HG changeset patch # User Christian Brabandt # Date 1471464007 -7200 # Node ID daecffbd0322a301f74a25a9f45ce875723bb278 # Parent 816999bfd4c85f00a50d40ee1662b280c9a39d3b commit https://github.com/vim/vim/commit/af9c4c9b5761c4c074237d87e2c95713bf721eab Author: Bram Moolenaar Date: Wed Aug 17 21:51:56 2016 +0200 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 --- 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 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -3291,10 +3291,10 @@ f_float2nr(typval_T *argvars, typval_T * 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 --- 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,