summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-05 15:12:49 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-05 15:12:49 -0800
commit5d6c53bb230b20b4bec8fb462df0031a14f4c995 (patch)
tree9ea377e5b79271600f277130a89bbe0f18980912 /git-compat-util.h
parente72c1dd3bd3b6b2255707136348628a99d3b74a5 (diff)
parentebaa1bd407745c4b4c1c0f20c322929fc4371467 (diff)
downloadgit-5d6c53bb230b20b4bec8fb462df0031a14f4c995.tar.gz
Merge branch 'na/strtoimax'
* 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 8b4dd5c022..230e198fc3 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