diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2008-10-03 07:41:25 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-03 07:41:25 -0700 |
| commit | 3e3d4ee7cb7726dcf799f95d27bce384c32b2c8a (patch) | |
| tree | fe6a29d3d62f85eea9953deaf5653741fe73e54c /cache.h | |
| parent | gitweb: Add support for extending the action bar with custom links (diff) | |
| parent | gitweb: Support for simple project search form (diff) | |
| download | tgif-3e3d4ee7cb7726dcf799f95d27bce384c32b2c8a.tar.xz | |
Merge branch 'pb/gitweb-tagcloud' into pb/gitweb
* pb/gitweb-tagcloud:
gitweb: Support for simple project search form
gitweb: Make the by_tag filter delve in forks as well
gitweb: Support for tag clouds
... (+ many updates from master) ...
Conflicts:
gitweb/gitweb.perl
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -6,8 +6,14 @@ #include "hash.h" #include SHA1_HEADER -#include <zlib.h> +#ifndef git_SHA_CTX +#define git_SHA_CTX SHA_CTX +#define git_SHA1_Init SHA1_Init +#define git_SHA1_Update SHA1_Update +#define git_SHA1_Final SHA1_Final +#endif +#include <zlib.h> #if defined(NO_DEFLATE_BOUND) || ZLIB_VERNUM < 0x1200 #define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11) #endif @@ -749,7 +755,6 @@ typedef int (*config_fn_t)(const char *, const char *, void *); extern int git_default_config(const char *, const char *, void *); extern int git_config_from_file(config_fn_t fn, const char *, void *); extern int git_config(config_fn_t fn, void *); -extern int git_parse_long(const char *, long *); extern int git_parse_ulong(const char *, unsigned long *); extern int git_config_int(const char *, const char *); extern unsigned long git_config_ulong(const char *, const char *); |