Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'xdiff-interface.h')
-rw-r--r--xdiff-interface.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h
index 6f3b361a84..f6a1ec2220 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -2,6 +2,7 @@
#define XDIFF_INTERFACE_H
#include "xdiff/xdiff.h"
+#include "strbuf.h"
struct xdiff_emit_state;
@@ -9,8 +10,7 @@ typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
struct xdiff_emit_state {
xdiff_emit_consume_fn consume;
- char *remainder;
- unsigned long remainder_size;
+ struct strbuf remainder;
};
int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);