tree 7380115d867612f500f48bc89e6ccc9046e809a3
parent 58e97730d9868364ea63afbf3ee94fc9b3f3a075
parent f18f816cb1586e9aab3e30a7144768e0d282d305
author Junio C Hamano <gitster@pobox.com> 1489783827 -0700
committer Junio C Hamano <gitster@pobox.com> 1489783827 -0700

Merge branch 'bc/sha1-header-selection-with-cpp-macros'

Our source code has used the SHA1_HEADER cpp macro after "#include"
in the C code to switch among the SHA-1 implementations. Instead,
list the exact header file names and switch among implementations
using "#ifdef BLK_SHA1/#include "block-sha1/sha1.h"/.../#endif";
this helps some IDE tools.

* bc/sha1-header-selection-with-cpp-macros:
  hash.h: move SHA-1 implementation selection into a header file