From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 1 Feb 2009 18:29:47 +0000 (+0100)
Subject: Merge branch 'lh/binary'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6?hp=-c

Merge branch 'lh/binary'
---

5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6
diff --combined cgit.h
index 4942b96,8b0defa..5f7af51
--- a/cgit.h
+++ b/cgit.h
@@@ -15,6 -15,7 +15,7 @@@
  #include <revision.h>
  #include <log-tree.h>
  #include <archive.h>
+ #include <xdiff-interface.h>
  #include <xdiff/xdiff.h>
  #include <utf8.h>
  
@@@ -135,7 -136,6 +136,7 @@@ struct cgit_config 
  	char *css;
  	char *favicon;
  	char *footer;
 +	char *header;
  	char *index_header;
  	char *index_info;
  	char *logo;
@@@ -222,7 -222,8 +223,8 @@@ extern void *cgit_free_commitinfo(struc
  
  extern int cgit_diff_files(const unsigned char *old_sha1,
  			   const unsigned char *new_sha1,
- 			   linediff_fn fn);
+ 			   unsigned long *old_size, unsigned long *new_size,
+ 			   int *binary, linediff_fn fn);
  
  extern void cgit_diff_tree(const unsigned char *old_sha1,
  			   const unsigned char *new_sha1,