aboutsummaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-10-27 13:30:30 -0400
committerJunio C Hamano <gitster@pobox.com>2016-10-27 10:36:45 -0700
commit5c238e29a85dd109e42513c6a9d09008d8839bae (patch)
treee88aabedd7ee8128b612d829e63f8355f3bf8bcf /git-compat-util.h
parentde61cebde72a15b85b6e6a06ef4c3614b6afdac8 (diff)
downloadgit-5c238e29a85dd109e42513c6a9d09008d8839bae.tar.gz
git-5c238e29a85dd109e42513c6a9d09008d8839bae.tar.xz
git-compat-util: move content inside ifdef/endif guards
Commit 3f2e2297b9 (add an extra level of indirection to main(), 2016-07-01) added a declaration to git-compat-util.h, but it was accidentally placed after the final #endif that guards against multiple inclusions. This doesn't have any actual impact on the code, since it's not incorrect to repeat a function declaration in C. But it's a bad habit, and makes it more likely for somebody else to make the same mistake. It also defeats gcc's optimization to avoid opening header files whose contents are completely guarded. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 1930444ef..f5b5d2e71 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1044,6 +1044,6 @@ struct tm *git_gmtime_r(const time_t *, struct tm *);
#define getc_unlocked(fh) getc(fh)
#endif
-#endif
-
extern int cmd_main(int, const char **);
+
+#endif