summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Brian Gernhardt <brian@gernhardtsoftware.com>2013-08-05 11:59:23 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-08-05 11:01:09 -0700
commitf2be034c6918e7f5d42da5ad1cf9d3ef51c25a77 (patch)
tree22f1d11d6019d2ff69ff6cbaa02f3e941ba1467d /builtin
parentMakefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1 (diff)
downloadtgif-f2be034c6918e7f5d42da5ad1cf9d3ef51c25a77.tar.xz
OS X: Fix redeclaration of die warning
compat/apple-common-crypto.h uses die() in one of its macros, but was included in git-compat-util.h before the definition of die. Fix by simply moving the relevant block after the die/error/warning declarations. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions