Merge branch 'lh/macros'

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index 568e0c088e543846739af1e51c4fcc06fbc82fcc..2bf6ab023fb44340b16e564c6cfee7a2b4442fa6 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -73,6 +73,7 @@ struct cgit_repo {
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
+       int enable_subject_links;
        int max_stats;
        time_t mtime;
        struct cgit_filter *about_filter;
@@ -145,6 +146,9 @@ struct cgit_query {
        char *sort;
        int showmsg;
        int ssdiff;
+       int show_all;
+       int context;
+       char *vpath;
 };
 
 struct cgit_config {
@@ -181,8 +185,10 @@ struct cgit_config {
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
+       int enable_subject_links;
        int enable_tree_linenumbers;
        int local_time;
+       int max_atom_items;
        int max_repo_count;
        int max_commit_count;
        int max_lock_attempts;
@@ -273,7 +279,7 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
 extern int cgit_diff_files(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
                           unsigned long *old_size, unsigned long *new_size,
-                          int *binary, linediff_fn fn);
+                          int *binary, int context, linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,