author | Lars Hjemli <hjemli@gmail.com> | 2009-02-01 18:29:47 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-02-01 18:29:47 (UTC) |
commit | 5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6 (patch) (unidiff) | |
tree | 823678b1c4a907cf0df50067c27fb5b752114df5 /cgit.h | |
parent | 0b3c746ba80738dbe0885a21406409390936537c (diff) | |
parent | 481ce5e298e2dcd7edc1d4a30e523dda2ce58b01 (diff) | |
download | cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.zip cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.gz cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.bz2 |
Merge branch 'lh/binary'
-rw-r--r-- | cgit.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -14,8 +14,9 @@ | |||
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <xdiff-interface.h> | ||
18 | #include <xdiff/xdiff.h> | 19 | #include <xdiff/xdiff.h> |
19 | #include <utf8.h> | 20 | #include <utf8.h> |
20 | 21 | ||
21 | 22 | ||
@@ -221,9 +222,10 @@ extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | |||
221 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 222 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
222 | 223 | ||
223 | extern int cgit_diff_files(const unsigned char *old_sha1, | 224 | extern int cgit_diff_files(const unsigned char *old_sha1, |
224 | const unsigned char *new_sha1, | 225 | const unsigned char *new_sha1, |
225 | linediff_fn fn); | 226 | unsigned long *old_size, unsigned long *new_size, |
227 | int *binary, linediff_fn fn); | ||
226 | 228 | ||
227 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 229 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
228 | const unsigned char *new_sha1, | 230 | const unsigned char *new_sha1, |
229 | filepair_fn fn, const char *prefix); | 231 | filepair_fn fn, const char *prefix); |