diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-15 14:55:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 14:55:40 -0800 |
| commit | a66b51c624d9d8700b57646322d23231d01b9be8 (patch) | |
| tree | 0ddd267f3602a6065ef5c0b55a1079f461a7b121 /sha1dc_git.h | |
| parent | b2e45c695d09f6a31ce09347ae0a5d2cdfe9dd4e (diff) | |
| parent | aa9b3b25c68804a96075b233f5b5e0f17ba3e3e2 (diff) | |
Merge branch 'ab/sha1dc-build'
Push the submodule version of collision-detecting SHA-1 hash
implementation a bit harder on builders.
* ab/sha1dc-build:
sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
Makefile: under "make dist", include the sha1collisiondetection submodule
Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto
Diffstat (limited to 'sha1dc_git.h')
| -rw-r--r-- | sha1dc_git.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sha1dc_git.h b/sha1dc_git.h index a8c2729278..41e1c3fd3f 100644 --- a/sha1dc_git.h +++ b/sha1dc_git.h @@ -1,9 +1,9 @@ /* Plumbing with collition-detecting SHA1 code */ -#ifdef DC_SHA1_SUBMODULE -#include "sha1collisiondetection/lib/sha1.h" -#elif defined(DC_SHA1_EXTERNAL) +#ifdef DC_SHA1_EXTERNAL #include <sha1dc/sha1.h> +#elif defined(DC_SHA1_SUBMODULE) +#include "sha1collisiondetection/lib/sha1.h" #else #include "sha1dc/sha1.h" #endif |