diff options
author | Junio C Hamano <junkio@cox.net> | 2006-04-24 22:31:15 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-04-24 22:31:15 -0700 |
commit | 5a6a8c0e012137a3f0059be40ec7b2f4aa614355 (patch) | |
tree | 842b775b4a96a35e98372e3073f314b8c6d2ff08 /patch-delta.c | |
parent | Merge branch 'jc/cache-tree' into next (diff) | |
parent | split the diff-delta interface (diff) | |
download | tgif-5a6a8c0e012137a3f0059be40ec7b2f4aa614355.tar.xz |
Merge branch 'np/delta' into next
* np/delta:
split the diff-delta interface
Document the configuration file
Document git-var -l listing also configuration variables
rev-parse: better error message for ambiguous arguments
Diffstat (limited to 'patch-delta.c')
-rw-r--r-- | patch-delta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-delta.c b/patch-delta.c index d95f0d9721..8f318ed8aa 100644 --- a/patch-delta.c +++ b/patch-delta.c @@ -13,8 +13,8 @@ #include <string.h> #include "delta.h" -void *patch_delta(void *src_buf, unsigned long src_size, - void *delta_buf, unsigned long delta_size, +void *patch_delta(const void *src_buf, unsigned long src_size, + const void *delta_buf, unsigned long delta_size, unsigned long *dst_size) { const unsigned char *data, *top; |