| commit | f2be034c6918e7f5d42da5ad1cf9d3ef51c25a77 | |
| author | Brian Gernhardt <brian@gernhardtsoftware.com> | |
| Mon, 5 Aug 2013 15:59:23 +0000 (5 11:59 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Aug 2013 18:01:09 +0000 (5 11:01 -0700) | ||
| tree | 22f1d11d6019d2ff69ff6cbaa02f3e941ba1467d | treesnapshot (tar.gz zip) |
| parent | c984938f9c454255012086e1203504dc243a59bd | commitdiff |
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>
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>
| git-compat-util.h | diffblobblamehistory |