diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-05 11:24:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-05 11:24:28 -0800 |
| commit | cd1c2e7301820f9a198c8d665cd72d930233d02a (patch) | |
| tree | bae2ad03e1ca04c3168e2f4bc2db840b14bc043d /git-compat-util.h | |
| parent | 0a79ccaac7dcfaf93294979fd9608d0f95fd7a47 (diff) | |
| parent | 6854a8f5c9ecf32f5bd85020e77d48d3ffdf48fc (diff) | |
| download | git-cd1c2e7301820f9a198c8d665cd72d930233d02a.tar.gz | |
Merge branch 'jk/common-main' into maint-2.10
* jk/common-main:
common-main: stop munging argv[0] path
git-compat-util: move content inside ifdef/endif guards
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index b4d9c2aa58..d89a78616b 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -1090,6 +1090,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 |