Re: [PATCH 2/4] msvc: Select the "fast" definition of the {get,put}_be32() macros

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Jun 24, 2010, 11:21 UTC
Message-ID: <20100624112148.GA12485@burratino>
In-Reply-To: <4C2264B6.5010906@ramsay1.demon.co.uk>

Ramsay Jones wrote:

Show 12 quoted lines

> diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c
> index d893475..e102856 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__)

Looks good to me, for what it’s worth. You might want a similar change on line 57:

 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__x86_64__) || \
+	defined(_M_IX86) || defined(_M_X64)
   #define setW(x, val) (*(volatile unsigned int *)&W(x) = (val))

Or alternatively, it might make sense to add something like the following to compat/mingw.h or git-compat-util.h to fix this once.

 #if defined(_M_IX86) && !defined(__i386__)
 # define __i386__
 #endif
 #if defined(_M_X64) && !defined (__x86_64__)
 # define __x86_64__
 #endif

Thanks, Jonathan