diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-28 19:32:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-28 19:32:33 (GMT) |
| commit | e39888ba21b68888e1db2d989155f23ea78fc842 (patch) | |
| tree | 58c214720ef480aa1bbad0d53fd2fa40683346a9 /Makefile | |
| parent | 786a9611f4d0aaa4316d38d48404ce63e090bb38 (diff) | |
| parent | ebaa1bd407745c4b4c1c0f20c322929fc4371467 (diff) | |
| download | git-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 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -57,8 +57,8 @@ all:: # # Define NO_STRLCPY if you don't have strlcpy. # -# Define NO_STRTOUMAX if you don't have strtoumax in the C library. -# If your compiler also does not support long long or does not have +# Define NO_STRTOUMAX if you don't have both strtoimax and strtoumax in the +# C library. If your compiler also does not support long long or does not have # strtoull, define NO_STRTOULL. # # Define NO_SETENV if you don't have setenv in the C library. @@ -1478,7 +1478,7 @@ ifdef NO_STRLCPY endif ifdef NO_STRTOUMAX COMPAT_CFLAGS += -DNO_STRTOUMAX - COMPAT_OBJS += compat/strtoumax.o + COMPAT_OBJS += compat/strtoumax.o compat/strtoimax.o endif ifdef NO_STRTOULL COMPAT_CFLAGS += -DNO_STRTOULL |