diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:40:55 +0000 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:40:55 +0000 |
| commit | 0bd3cd90d902a1419db129427980ad7af1650d50 (patch) | |
| tree | 2554d10989c0387909d002f41ecbf380dd431b8b /src/xdiff | |
| parent | 4cb64e3b084995a0924d521e89c3e341e2200a6a (diff) | |
| parent | 4a8bf24ac690004aedf5540fa440e788459e5e34 (diff) | |
| download | rneovim-0bd3cd90d902a1419db129427980ad7af1650d50.tar.gz rneovim-0bd3cd90d902a1419db129427980ad7af1650d50.tar.bz2 rneovim-0bd3cd90d902a1419db129427980ad7af1650d50.zip | |
Merge remote-tracking branch 'upstream/master' into fix_20726
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 { |