Merge branch 'jc/maint-format-patch-o-relative' into maint

[git.git] / arm / sha1.h

diff --git a/arm/sha1.h b/arm/sha1.h
index 3952646349cf9d033177e69ba9433652a378c0e9..b61b618486f9776170efaa0f76dda728b19a164f 100644 (file)
--- a/arm/sha1.h
+++ b/arm/sha1.h
@@ -7,12 +7,17 @@
 
 #include <stdint.h>
 
-typedef struct sha_context {
+typedef struct {
        uint64_t len;
        uint32_t hash[5];
        unsigned char buffer[64];
-} SHA_CTX;
+} arm_SHA_CTX;
 
-void SHA1_Init(SHA_CTX *c);
-void SHA1_Update(SHA_CTX *c, const void *p, unsigned long n);
-void SHA1_Final(unsigned char *hash, SHA_CTX *c);
+void arm_SHA1_Init(arm_SHA_CTX *c);
+void arm_SHA1_Update(arm_SHA_CTX *c, const void *p, unsigned long n);
+void arm_SHA1_Final(unsigned char *hash, arm_SHA_CTX *c);
+
+#define git_SHA_CTX    arm_SHA_CTX
+#define git_SHA1_Init  arm_SHA1_Init
+#define git_SHA1_Update        arm_SHA1_Update
+#define git_SHA1_Final arm_SHA1_Final