Skip to content

Commit

Permalink
sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
avar authored and gitster committed Dec 8, 2017
1 parent bc2ed31 commit aa9b3b2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions 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
Expand Down

0 comments on commit aa9b3b2

Please sign in to comment.