diff options
author | lookshe <github@lookshe.org> | 2016-07-12 09:22:30 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2016-07-12 09:22:30 +0200 |
commit | 1787404b6a618d07200db241c004d1bedc92f874 (patch) | |
tree | aff8c654e8f3190210f80b4c886ee5a8e88e26fd /ui-shared.h | |
parent | 2209fe5157b431cf57898deb889acdcc704dda64 (diff) | |
parent | 40fbefba0514b33988d453aea05aa2b956e98f84 (diff) |
Merge branch 'master' into lookshe/masterlookshe/master
Conflicts:
filters/html-converters/md2html
Diffstat (limited to 'ui-shared.h')
-rw-r--r-- | ui-shared.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui-shared.h b/ui-shared.h index 6b4f9aa..aadc271 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -70,8 +70,8 @@ __attribute__((format (printf,1,2))) extern void cgit_print_error(const char *fmt, ...); __attribute__((format (printf,1,0))) extern void cgit_vprint_error(const char *fmt, va_list ap); -extern void cgit_print_date(time_t secs, const char *format, int local_time); -extern void cgit_print_age(time_t t, time_t max_relative, const char *format); +extern const struct date_mode *cgit_date_mode(enum date_mode_type type); +extern void cgit_print_age(time_t t, int tz, time_t max_relative); extern void cgit_print_http_headers(void); extern void cgit_redirect(const char *url, bool permanent); extern void cgit_print_docstart(void); @@ -80,6 +80,8 @@ __attribute__((format (printf,3,4))) extern void cgit_print_error_page(int code, const char *msg, const char *fmt, ...); extern void cgit_print_pageheader(void); extern void cgit_print_filemode(unsigned short mode); +extern void cgit_compose_snapshot_prefix(struct strbuf *filename, + const char *base, const char *ref); extern void cgit_print_snapshot_links(const char *repo, const char *head, const char *hex, int snapshots); extern void cgit_add_hidden_formfields(int incl_head, int incl_search, |