summaryrefslogtreecommitdiff
path: root/hash.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-08-15 12:04:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-16 21:43:59 (GMT)
commit36f048c5e488005da0a9dfba6b617c7c9951c7cf (patch)
treeee859ed5ef5bfb9358967e87ce69a1f8ba84856a /hash.h
parent5800c63717ae35286a1441f14ffff753e01f7e2b (diff)
downloadgit-36f048c5e488005da0a9dfba6b617c7c9951c7cf.zip
git-36f048c5e488005da0a9dfba6b617c7c9951c7cf.tar.gz
git-36f048c5e488005da0a9dfba6b617c7c9951c7cf.tar.bz2
sha1dc: build git plumbing code more explicitly
The plumbing code between sha1dc and git is defined in sha1dc_git.[ch], but these aren't compiled / included directly but only via the indirect inclusion from sha1dc code. This is slightly confusing when you try to trace the build flow. This patch brings the following changes for simplification: - Make sha1dc_git.c stand-alone and build from Makefile - sha1dc_git.h is the common header to include further sha1.h depending on the build condition - Move comments for plumbing codes from the header to definitions This is also meant as a preliminary work for further plumbing with external sha1dc shlib. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'hash.h')
-rw-r--r--hash.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/hash.h b/hash.h
index bef3e63..024d0d3 100644
--- a/hash.h
+++ b/hash.h
@@ -8,11 +8,7 @@
#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
+#include "sha1dc_git.h"
#else /* SHA1_BLK */
#include "block-sha1/sha1.h"
#endif