diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:39:54 +0000 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:39:54 +0000 |
| commit | 21cb7d04c387e4198ca8098a884c78b56ffcf4c2 (patch) | |
| tree | 84fe5690df1551f0bb2bdfe1a13aacd29ebc1de7 /src/xdiff | |
| parent | d9c904f85a23a496df4eb6be42aa43f007b22d50 (diff) | |
| parent | 4a8bf24ac690004aedf5540fa440e788459e5e34 (diff) | |
| download | rneovim-colorcolchar.tar.gz rneovim-colorcolchar.tar.bz2 rneovim-colorcolchar.zip | |
Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar
Diffstat (limited to 'src/xdiff')
| -rw-r--r-- | src/xdiff/xdiff.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xdiff/xdiff.h b/src/xdiff/xdiff.h index 49985a0e9a..a6ce57dcb1 100644 --- a/src/xdiff/xdiff.h +++ b/src/xdiff/xdiff.h @@ -69,12 +69,12 @@ extern "C" { typedef struct s_mmfile { char *ptr; - long size; + int size; } mmfile_t; typedef struct s_mmbuffer { char *ptr; - long size; + int size; } mmbuffer_t; typedef struct s_xpparam { @@ -102,8 +102,8 @@ typedef struct s_xdemitcb { typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv); -typedef int (*xdl_emit_hunk_consume_func_t)(long start_a, long count_a, - long start_b, long count_b, +typedef int (*xdl_emit_hunk_consume_func_t)(int start_a, int count_a, + int start_b, int count_b, void *cb_data); typedef struct s_xdemitconf { |