diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-04-11 18:43:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-11 18:43:01 -0700 |
| commit | 566f5b217df73d6a642a0857cc5c13c11f84e7c3 (patch) | |
| tree | ff172bf2658ca4e1f4c88d30bb80c8af17f29b2d /cache.h | |
| parent | gitweb: Allow configuring the default projects order and add order 'none' (diff) | |
| parent | GIT 1.5.1.1 (diff) | |
| download | tgif-566f5b217df73d6a642a0857cc5c13c11f84e7c3.tar.xz | |
Merge branch 'maint'
* maint:
GIT 1.5.1.1
cvsserver: Fix handling of diappeared files on update
fsck: do not complain on detached HEAD.
(encode_85, decode_85): Mark source buffer pointer as "const".
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -472,8 +472,8 @@ extern int pager_in_use; extern int pager_use_color; /* base85 */ -int decode_85(char *dst, char *line, int linelen); -void encode_85(char *buf, unsigned char *data, int bytes); +int decode_85(char *dst, const char *line, int linelen); +void encode_85(char *buf, const unsigned char *data, int bytes); /* alloc.c */ struct blob; |