[PATCH 2/4] sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
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. Signed-off-by: Ævar Arnfjörð Bjarmason --- sha1dc_git.h | 6 +++--- 1 file 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 +#elif defined(DC_SHA1_SUBMODULE) +#include "sha1collisiondetection/lib/sha1.h" #else #include "sha1dc/sha1.h" #endif -- 2.15.0.403.gc27cc4dac6
Re: [PATCH 2/4] sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
On Tue, Nov 28, 2017 at 09:32:12PM +, Ævar Arnfjörð Bjarmason wrote: > 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. OK. This flips the priority, but we're assuming that the Makefile doesn't allow you to actually set both flags (at least not easily). And I think that is the case, even after your loosening of the error for "auto" in the previous patch, because the whole DC_SHA1_SUBMODULE code-path is in the "else" block for DC_SHA1_EXTERNAL. Good. -Peff
