diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-05 23:12:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-05 23:12:49 (GMT) |
| commit | 5d6c53bb230b20b4bec8fb462df0031a14f4c995 (patch) | |
| tree | 9ea377e5b79271600f277130a89bbe0f18980912 /Makefile | |
| parent | e72c1dd3bd3b6b2255707136348628a99d3b74a5 (diff) | |
| parent | ebaa1bd407745c4b4c1c0f20c322929fc4371467 (diff) | |
| download | git-5d6c53bb230b20b4bec8fb462df0031a14f4c995.zip git-5d6c53bb230b20b4bec8fb462df0031a14f4c995.tar.gz git-5d6c53bb230b20b4bec8fb462df0031a14f4c995.tar.bz2 | |
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 '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 |