summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2010-06-23 19:47:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-28 04:59:32 (GMT)
commit078e9bce1e8e2484d33d7400ae02c10954fd93ac (patch)
tree74a0bf81ac8c04abb87da3cb6b88ab6e0c8a1eca
parent492b10766f499b60bdc867c253f36d274ac51538 (diff)
downloadgit-078e9bce1e8e2484d33d7400ae02c10954fd93ac.zip
git-078e9bce1e8e2484d33d7400ae02c10954fd93ac.tar.gz
git-078e9bce1e8e2484d33d7400ae02c10954fd93ac.tar.bz2
msvc: Select the "fast" definition of the {get,put}_be32() macros
On Intel machines, the msvc compiler defines the CPU architecture macros _M_IX86 and _M_X64 (equivalent to __i386__ and __x86_64__ respectively). Use these macros in the pre-processor expression to select the "fast" definition of the {get,put}_be32() macros. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--block-sha1/sha1.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c
index d880a53..c0054a0 100644
--- a/block-sha1/sha1.c
+++ b/block-sha1/sha1.c
@@ -70,6 +70,7 @@
*/
#if defined(__i386__) || defined(__x86_64__) || \
+ defined(_M_IX86) || defined(_M_X64) || \
defined(__ppc__) || defined(__ppc64__) || \
defined(__powerpc__) || defined(__powerpc64__) || \
defined(__s390__) || defined(__s390x__)