Merge branch 'do/https'

[ps-cgit] / cgit.h

diff --git a/cgit.h b/cgit.h
index 4fe94c69e6939d969572a6c1b4601d5267f390c2..00aca4c36a46d6dc8737b32ea794c917dcfc825e 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -15,6 +15,7 @@
 #include <revision.h>
 #include <log-tree.h>
 #include <archive.h>
 #include <revision.h>
 #include <log-tree.h>
 #include <archive.h>

+#include <xdiff-interface.h>

 #include <xdiff/xdiff.h>
 #include <utf8.h>
 
 #include <xdiff/xdiff.h>
 #include <utf8.h>
 


@@ -135,6 +136,7 @@ struct cgit_config {
        char *css;
        char *favicon;
        char *footer;
        char *css;
        char *favicon;
        char *footer;

+       char *header;

        char *index_header;
        char *index_info;
        char *logo;
        char *index_header;
        char *index_info;
        char *logo;


@@ -179,6 +181,8 @@ struct cgit_page {
        char *charset;
        char *filename;
        char *title;
        char *charset;
        char *filename;
        char *title;

+       int status;
+       char *statusmsg;

 };
 
 struct cgit_context {
 };
 
 struct cgit_context {


@@ -221,7 +225,8 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
 
 extern int cgit_diff_files(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
 
 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,
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,