summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-17 20:50:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-17 20:50:27 (GMT)
commit81944e9b54039f8475d1df5c40e5a1055eae14f6 (patch)
tree7380115d867612f500f48bc89e6ccc9046e809a3 /cache.h
parent58e97730d9868364ea63afbf3ee94fc9b3f3a075 (diff)
parentf18f816cb1586e9aab3e30a7144768e0d282d305 (diff)
downloadgit-81944e9b54039f8475d1df5c40e5a1055eae14f6.zip
git-81944e9b54039f8475d1df5c40e5a1055eae14f6.tar.gz
git-81944e9b54039f8475d1df5c40e5a1055eae14f6.tar.bz2
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
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index dc261f4..26f336b 100644
--- a/cache.h
+++ b/cache.h
@@ -10,8 +10,8 @@
#include "trace.h"
#include "string-list.h"
#include "pack-revindex.h"
+#include "hash.h"
-#include SHA1_HEADER
#ifndef platform_SHA_CTX
/*
* platform's underlying implementation of SHA-1; could be OpenSSL,