aboutsummaryrefslogtreecommitdiff
path: root/merge-blobs.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-28 14:06:00 -0700
committerJunio C Hamano <gitster@pobox.com>2017-03-28 14:06:00 -0700
commit62dc8b5fbc7368c1bde0d29a00ddb204f6c9d1b6 (patch)
treed9f889ad727d222ccb1934dc5f713886ecb87b1c /merge-blobs.h
parent0330344e0f63415421aff87d29ee037d3ea3b436 (diff)
parent7e71542e8b79ddd5164bf3ac5f11cae3b7d006ab (diff)
downloadgit-62dc8b5fbc7368c1bde0d29a00ddb204f6c9d1b6.tar.gz
git-62dc8b5fbc7368c1bde0d29a00ddb204f6c9d1b6.tar.xz
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
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions