diff options
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xdiff/xutils.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c index 16ebc614fc..b09052c1d7 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1699, +/**/ 1698, /**/ 1697, diff --git a/src/xdiff/xutils.c b/src/xdiff/xutils.c index a4370e610b..fde0afb480 100644 --- a/src/xdiff/xutils.c +++ b/src/xdiff/xutils.c @@ -442,7 +442,7 @@ void* xdl_alloc_grow_helper(void *p, long nr, long *alloc, size_t size) if (SIZE_MAX / size >= n) tmp = xdl_realloc(p, n * size); if (tmp) { - *alloc = n; + *alloc = (long)n; } else { xdl_free(p); *alloc = 0; |