summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-06 20:52:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-06 20:56:45 (GMT)
commitfd536d3439fa2a06730884df31e2e98c9006c947 (patch)
tree8520d4baca7899254ef2bc749ca0d28e9d184c3b
parentb8e48a89b8f581eaf95b57782bb8e620ca30e968 (diff)
downloadgit-fd536d3439fa2a06730884df31e2e98c9006c947.zip
git-fd536d3439fa2a06730884df31e2e98c9006c947.tar.gz
git-fd536d3439fa2a06730884df31e2e98c9006c947.tar.bz2
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>
-rw-r--r--block-sha1/sha1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c
index a45a3de..698e435 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)