diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-07-01 22:05:46 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-03 10:09:34 -0700 |
| commit | 86cfd61e6bc12745751c43b4f69886b290cd85cb (patch) | |
| tree | 5a770d2400f5d4c37248d31056f962bf2cbe2cbf /hash.h | |
| parent | 9936c1b52a39fa14fca04f937df3e75f7498ac66 (diff) | |
| download | git-86cfd61e6bc12745751c43b4f69886b290cd85cb.tar.gz | |
sha1dc: optionally use sha1collisiondetection as a submodule
Add an option to use the sha1collisiondetection library from the
submodule in sha1collisiondetection/ instead of in the copy in the
sha1dc/ directory.
This allows us to try out the submodule in sha1collisiondetection
without breaking the build for anyone who's not expecting them as we
work out any kinks.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'hash.h')
| -rw-r--r-- | hash.h | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -8,7 +8,11 @@ #elif defined(SHA1_OPENSSL) #include <openssl/sha.h> #elif defined(SHA1_DC) +#ifdef DC_SHA1_SUBMODULE +#include "sha1collisiondetection/lib/sha1.h" +#else #include "sha1dc/sha1.h" +#endif #else /* SHA1_BLK */ #include "block-sha1/sha1.h" #endif |