aboutsummaryrefslogtreecommitdiff
path: root/src/xdiff/xdiff.h
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2023-11-30 20:35:25 +0000
committerJosh Rahm <joshuarahm@gmail.com>2023-11-30 20:35:25 +0000
commit1b7b916b7631ddf73c38e3a0070d64e4636cb2f3 (patch)
treecd08258054db80bb9a11b1061bb091c70b76926a /src/xdiff/xdiff.h
parenteaa89c11d0f8aefbb512de769c6c82f61a8baca3 (diff)
parent4a8bf24ac690004aedf5540fa440e788459e5e34 (diff)
downloadrneovim-aucmd_textputpost.tar.gz
rneovim-aucmd_textputpost.tar.bz2
rneovim-aucmd_textputpost.zip
Merge remote-tracking branch 'upstream/master' into aucmd_textputpostaucmd_textputpost
Diffstat (limited to 'src/xdiff/xdiff.h')
-rw-r--r--src/xdiff/xdiff.h8
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 {