diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-06 13:52:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-06 13:56:45 -0700 |
| commit | fd536d3439fa2a06730884df31e2e98c9006c947 (patch) | |
| tree | 8520d4baca7899254ef2bc749ca0d28e9d184c3b /block-sha1 | |
| parent | b8e48a89b8f581eaf95b57782bb8e620ca30e968 (diff) | |
| download | git-fd536d3439fa2a06730884df31e2e98c9006c947.tar.gz | |
block-sha1: minor fixups
Bert Wesarg noticed non-x86 version of SHA_ROT() had a typo.
Also spell in-line assembly as __asm__(), otherwise I seem to get
error: implicit declaration of function 'asm' from my compiler.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'block-sha1')
| -rw-r--r-- | block-sha1/sha1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c index a45a3dec1e..698e435a39 100644 --- a/block-sha1/sha1.c +++ b/block-sha1/sha1.c @@ -82,13 +82,13 @@ void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx) #if defined(__i386__) || defined(__x86_64__) -#define SHA_ASM(op, x, n) ({ unsigned int __res; asm(op " %1,%0":"=r" (__res):"i" (n), "0" (x)); __res; }) +#define SHA_ASM(op, x, n) ({ unsigned int __res; __asm__(op " %1,%0":"=r" (__res):"i" (n), "0" (x)); __res; }) #define SHA_ROL(x,n) SHA_ASM("rol", x, n) #define SHA_ROR(x,n) SHA_ASM("ror", x, n) #else -#define SHA_ROT(X,n) (((X) << (l)) | ((X) >> (r))) +#define SHA_ROT(X,l,r) (((X) << (l)) | ((X) >> (r))) #define SHA_ROL(X,n) SHA_ROT(X,n,32-(n)) #define SHA_ROR(X,n) SHA_ROT(X,32-(n),n) |