diff options
Diffstat (limited to 'src/xdiff/xmerge.c')
| -rw-r--r-- | src/xdiff/xmerge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xdiff/xmerge.c b/src/xdiff/xmerge.c index 9e13b25ab..84e424672 100644 --- a/src/xdiff/xmerge.c +++ b/src/xdiff/xmerge.c @@ -149,9 +149,9 @@ static int fill_conflict_hunk(xdfenv_t *xe1, const char *name1, int size, int i, int style, xdmerge_t *m, char *dest, int marker_size) { - int marker1_size = (name1 ? strlen(name1) + 1 : 0); - int marker2_size = (name2 ? strlen(name2) + 1 : 0); - int marker3_size = (name3 ? strlen(name3) + 1 : 0); + int marker1_size = (name1 ? (int)strlen(name1) + 1 : 0); + int marker2_size = (name2 ? (int)strlen(name2) + 1 : 0); + int marker3_size = (name3 ? (int)strlen(name3) + 1 : 0); if (marker_size <= 0) marker_size = DEFAULT_CONFLICT_MARKER_SIZE; |