diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-12-08 22:29:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-08 15:01:01 -0800 |
| commit | aa9b3b25c68804a96075b233f5b5e0f17ba3e3e2 (patch) | |
| tree | 103bd82c471b64bc3987e8e86003425d7d9d6595 /sha1dc_git.h | |
| parent | bc2ed316e409df22af1cfc5fe1fa8b18a6a7311d (diff) | |
| download | git-aa9b3b25c68804a96075b233f5b5e0f17ba3e3e2.tar.gz | |
sha1dc_git.h: re-arrange an ifdef chain for a subsequent changeab/sha1dc-build
A subsequent change will change the semantics of DC_SHA1_SUBMODULE in
a way that would require moving these checks around, so start by
moving them around without any functional changes to reduce the size
of the subsequent patch.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 |