summaryrefslogtreecommitdiff
path: root/hash.h
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2017-07-01 22:05:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-07-03 17:09:34 (GMT)
commit86cfd61e6bc12745751c43b4f69886b290cd85cb (patch)
tree5a770d2400f5d4c37248d31056f962bf2cbe2cbf /hash.h
parent9936c1b52a39fa14fca04f937df3e75f7498ac66 (diff)
downloadgit-86cfd61e6bc12745751c43b4f69886b290cd85cb.zip
git-86cfd61e6bc12745751c43b4f69886b290cd85cb.tar.gz
git-86cfd61e6bc12745751c43b4f69886b290cd85cb.tar.bz2
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.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/hash.h b/hash.h
index a11fc92..bef3e63 100644
--- a/hash.h
+++ b/hash.h
@@ -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