summaryrefslogtreecommitdiffabout
path: root/cgit.h
authorLars Hjemli <hjemli@gmail.com>2009-02-01 18:29:47 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-02-01 18:29:47 (UTC)
commit5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6 (patch) (unidiff)
tree823678b1c4a907cf0df50067c27fb5b752114df5 /cgit.h
parent0b3c746ba80738dbe0885a21406409390936537c (diff)
parent481ce5e298e2dcd7edc1d4a30e523dda2ce58b01 (diff)
downloadcgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.zip
cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.gz
cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.bz2
Merge branch 'lh/binary'
Diffstat (limited to 'cgit.h') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/cgit.h b/cgit.h
index 4942b96..5f7af51 100644
--- a/cgit.h
+++ b/cgit.h
@@ -15,6 +15,7 @@
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
@@ -222,7 +223,8 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
222 223
223extern int cgit_diff_files(const unsigned char *old_sha1, 224extern 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
227extern void cgit_diff_tree(const unsigned char *old_sha1, 229extern void cgit_diff_tree(const unsigned char *old_sha1,
228 const unsigned char *new_sha1, 230 const unsigned char *new_sha1,