Merge branch 'vs/typofixes'

diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c
index facea1bb560b57bbe7419dd1cce49f6b1172ddca..3a1735e5ca4d169c22446f4a6c84bfbb55c55ce4 100644 (file)
--- a/sha1dc/sha1.c
+++ b/sha1dc/sha1.c
@@ -918,7 +918,7 @@ static void sha1recompress_fast_ ## t (uint32_t ihvin[5], uint32_t ihvout[5], co
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4127)  /* Complier complains about the checks in the above macro being constant. */
+#pragma warning(disable: 4127)  /* Compiler complains about the checks in the above macro being constant. */
 #endif
 
 #ifdef DOSTORESTATE0