diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-18 21:48:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-18 21:48:32 -0700 |
| commit | 42d504248830452275dbe1c864f0b1771d7b1a05 (patch) | |
| tree | 011c7f094bfcdd41f510461c720485c8fbf1791e /ppc | |
| parent | Merge branch 'master' into next (diff) | |
| parent | Support for extracting configuration from different files (diff) | |
| download | tgif-42d504248830452275dbe1c864f0b1771d7b1a05.tar.xz | |
Merge branch 'pb/config' into next
* pb/config:
Support for extracting configuration from different files
Fix PPC SHA1 routine for large input buffers
Make t8001-annotate and t8002-blame more portable
Remove "refs" field from "struct object"
Make release tarballs friendlier to older tar versions
Diffstat (limited to 'ppc')
| -rw-r--r-- | ppc/sha1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ppc/sha1.c b/ppc/sha1.c index 5ba4fc5259..0820398b00 100644 --- a/ppc/sha1.c +++ b/ppc/sha1.c @@ -30,7 +30,7 @@ int SHA1_Update(SHA_CTX *c, const void *ptr, unsigned long n) unsigned long nb; const unsigned char *p = ptr; - c->len += n << 3; + c->len += (uint64_t) n << 3; while (n != 0) { if (c->cnt || n < 64) { nb = 64 - c->cnt; |