From: Junio C Hamano Date: Tue, 28 Mar 2017 21:06:00 +0000 (-0700) Subject: Merge branch 'jk/sha1dc' X-Git-Tag: v2.13.0-rc0~52 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62dc8b5fbc7368c1bde0d29a00ddb204f6c9d1b6;p=thirdparty%2Fgit.git Merge branch 'jk/sha1dc' sha1dc/sha1.c wanted to check the endianness of the target platform at compilation time and used a CPP macro with a rather overly generic name, "BIGENDIAN", to pass the result of the check around in the file. It wasn't prepared for the same macro set to 0 (false) by the platform to signal that the target is _not_ a big endian box, and assumed that the endianness detection logic it has alone would be the one that is setting the macro, resulting in a breakage on Windows. This has been fixed by using a bit less generic name for the same purpose. * jk/sha1dc: sha1dc: avoid CPP macro collisions --- 62dc8b5fbc7368c1bde0d29a00ddb204f6c9d1b6