From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 31 Oct 2016 20:15:23 +0000 (-0700)
Subject: Merge branch 'jk/common-main'
X-Git-Tag: v2.11.0-rc0~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b8171981fdea62f1f4c44f6d26f65b6324b31263?hp=9fa1f902bf8eaaa2a1d78cd7603d28a33d46e30c

Merge branch 'jk/common-main'

A trivial clean-up to a recently graduated topic.

* jk/common-main:
git-compat-util: move content inside ifdef/endif guards
---

diff --git a/git-compat-util.h b/git-compat-util.h
index 49ca28cb6b..87237b092b 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1101,6 +1101,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