patch 7.4.2125

Problem:    Compiler warning for loss of data.
Solution:   Add a type cast. (Christian Brabandt)

diff --git a/src/message.c b/src/message.c
index fe68b5bd005f3b38dba46bb1c12367184b3db9aa..b4d7b65e6727667094ad3acca00cdd7655ddc961 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -304,7 +304,7 @@ trunc_string(
            if (len + n > room || half == 0)
                break;
            len += n;
-           i = half;
+           i = (int)half;
        }
     }
     else

diff --git a/src/version.c b/src/version.c
index 9c771022ea5f46d2b488ca920c5d5cc119574b60..429dda03fa426cbc405cdd0cdc90653243bda797 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 */
+/**/
+    2125,
 /**/
     2124,
 /**/