summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-28 19:32:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-28 19:32:33 (GMT)
commite39888ba21b68888e1db2d989155f23ea78fc842 (patch)
tree58c214720ef480aa1bbad0d53fd2fa40683346a9 /git-compat-util.h
parent786a9611f4d0aaa4316d38d48404ce63e090bb38 (diff)
parentebaa1bd407745c4b4c1c0f20c322929fc4371467 (diff)
downloadgit-e39888ba21b68888e1db2d989155f23ea78fc842.zip
git-e39888ba21b68888e1db2d989155f23ea78fc842.tar.gz
git-e39888ba21b68888e1db2d989155f23ea78fc842.tar.bz2
Merge branch 'na/strtoimax' into maint
* na/strtoimax: Support sizes >=2G in various config options accepting 'g' sizes. Compatibility: declare strtoimax() under NO_STRTOUMAX Add strtoimax() compatibility function.
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 8b4dd5c..230e198 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -351,6 +351,8 @@ extern size_t gitstrlcpy(char *, const char *, size_t);
#ifdef NO_STRTOUMAX
#define strtoumax gitstrtoumax
extern uintmax_t gitstrtoumax(const char *, char **, int);
+#define strtoimax gitstrtoimax
+extern intmax_t gitstrtoimax(const char *, char **, int);
#endif
#ifdef NO_STRTOK_R