author | Lars Hjemli <hjemli@gmail.com> | 2010-08-04 01:10:24 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-04 01:10:24 (UTC) |
commit | e6c960c7c0f0d2e54b51cc43ef190df3ce52755e (patch) (unidiff) | |
tree | 29b49ca32a3de23b58ef5c2b7e522b607b60f356 /cgit.h | |
parent | 6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12 (diff) | |
parent | 39c2e224d3c55dfa1a7668399897be295be07dc7 (diff) | |
download | cgit-e6c960c7c0f0d2e54b51cc43ef190df3ce52755e.zip cgit-e6c960c7c0f0d2e54b51cc43ef190df3ce52755e.tar.gz cgit-e6c960c7c0f0d2e54b51cc43ef190df3ce52755e.tar.bz2 |
Merge branch 'js/notes'
-rw-r--r-- | cgit.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,53 +1,54 @@ | |||
1 | #ifndef CGIT_H | 1 | #ifndef CGIT_H |
2 | #define CGIT_H | 2 | #define CGIT_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <git-compat-util.h> | 5 | #include <git-compat-util.h> |
6 | #include <cache.h> | 6 | #include <cache.h> |
7 | #include <grep.h> | 7 | #include <grep.h> |
8 | #include <object.h> | 8 | #include <object.h> |
9 | #include <tree.h> | 9 | #include <tree.h> |
10 | #include <commit.h> | 10 | #include <commit.h> |
11 | #include <tag.h> | 11 | #include <tag.h> |
12 | #include <diff.h> | 12 | #include <diff.h> |
13 | #include <diffcore.h> | 13 | #include <diffcore.h> |
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <string-list.h> | 18 | #include <string-list.h> |
19 | #include <xdiff-interface.h> | 19 | #include <xdiff-interface.h> |
20 | #include <xdiff/xdiff.h> | 20 | #include <xdiff/xdiff.h> |
21 | #include <utf8.h> | 21 | #include <utf8.h> |
22 | #include <notes.h> | ||
22 | 23 | ||
23 | 24 | ||
24 | /* | 25 | /* |
25 | * Dateformats used on misc. pages | 26 | * Dateformats used on misc. pages |
26 | */ | 27 | */ |
27 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" | 28 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
28 | #define FMT_SHORTDATE "%Y-%m-%d" | 29 | #define FMT_SHORTDATE "%Y-%m-%d" |
29 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" | 30 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" |
30 | 31 | ||
31 | 32 | ||
32 | /* | 33 | /* |
33 | * Limits used for relative dates | 34 | * Limits used for relative dates |
34 | */ | 35 | */ |
35 | #define TM_MIN 60 | 36 | #define TM_MIN 60 |
36 | #define TM_HOUR (TM_MIN * 60) | 37 | #define TM_HOUR (TM_MIN * 60) |
37 | #define TM_DAY (TM_HOUR * 24) | 38 | #define TM_DAY (TM_HOUR * 24) |
38 | #define TM_WEEK (TM_DAY * 7) | 39 | #define TM_WEEK (TM_DAY * 7) |
39 | #define TM_YEAR (TM_DAY * 365) | 40 | #define TM_YEAR (TM_DAY * 365) |
40 | #define TM_MONTH (TM_YEAR / 12.0) | 41 | #define TM_MONTH (TM_YEAR / 12.0) |
41 | 42 | ||
42 | 43 | ||
43 | /* | 44 | /* |
44 | * Default encoding | 45 | * Default encoding |
45 | */ | 46 | */ |
46 | #define PAGE_ENCODING "UTF-8" | 47 | #define PAGE_ENCODING "UTF-8" |
47 | 48 | ||
48 | typedef void (*configfn)(const char *name, const char *value); | 49 | typedef void (*configfn)(const char *name, const char *value); |
49 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 50 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
50 | typedef void (*linediff_fn)(char *line, int len); | 51 | typedef void (*linediff_fn)(char *line, int len); |
51 | 52 | ||
52 | struct cgit_filter { | 53 | struct cgit_filter { |
53 | char *cmd; | 54 | char *cmd; |