aboutsummaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-28 11:32:33 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-28 11:32:33 -0800
commite39888ba21b68888e1db2d989155f23ea78fc842 (patch)
tree58c214720ef480aa1bbad0d53fd2fa40683346a9 /compat
parent786a9611f4d0aaa4316d38d48404ce63e090bb38 (diff)
parentebaa1bd407745c4b4c1c0f20c322929fc4371467 (diff)
downloadgit-e39888ba21b68888e1db2d989155f23ea78fc842.tar.gz
git-e39888ba21b68888e1db2d989155f23ea78fc842.tar.xz
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 'compat')
-rw-r--r--compat/strtoimax.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/compat/strtoimax.c b/compat/strtoimax.c
new file mode 100644
index 000000000..ac09ed89e
--- /dev/null
+++ b/compat/strtoimax.c
@@ -0,0 +1,10 @@
+#include "../git-compat-util.h"
+
+intmax_t gitstrtoimax (const char *nptr, char **endptr, int base)
+{
+#if defined(NO_STRTOULL)
+ return strtol(nptr, endptr, base);
+#else
+ return strtoll(nptr, endptr, base);
+#endif
+}