Merge branch 'lh/binary'

diff --combined cgit.h
index 4942b96277e56752cb227cbda954a20892e1288b,8b0defa988d062a24fa40dbcd7a39d2b68de61cb..5f7af51a68e0a773cac9c2758df51d5f0af90ff6
--- 1/cgit.h
--- 2/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,