diff options
author | Carlos Martín Nieto <cmn@dwim.me> | 2015-02-20 19:40:45 +0100 |
---|---|---|
committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-02-20 19:40:45 +0100 |
commit | 366e53d3da72805a3db1a1e77d4666416fcb5a93 (patch) | |
tree | ea69381ce300404dcb77b72a6adcff6b2f206156 | |
parent | 5091aff7823dd7badd821afc89b1c4c6761b13cf (diff) | |
parent | c92987d1575b93eac3b6fa4d1b4bc166137305ac (diff) | |
download | libgit2-366e53d3da72805a3db1a1e77d4666416fcb5a93.tar.gz |
Merge pull request #2921 from libgit2/ntk/macosx_build_cherrypicked
Fix MAX 32 bit build problem described in libgit2/libgit2#2917
-rw-r--r-- | src/integer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/integer.h b/src/integer.h index 8e86a48a5..b08094c2f 100644 --- a/src/integer.h +++ b/src/integer.h @@ -58,7 +58,7 @@ GIT_INLINE(bool) git__add_uint64_overflow(uint64_t *out, uint64_t one, uint64_t #if (SIZE_MAX == UINT_MAX) && __has_builtin(__builtin_uadd_overflow) # define git__add_sizet_overflow(out, one, two) \ __builtin_uadd_overflow(one, two, out) -# define git__multiply_sizet_overflow(out, one, two) +# define git__multiply_sizet_overflow(out, one, two) \ __builtin_umul_overflow(one, two, out) #elif (SIZE_MAX == ULONG_MAX) && __has_builtin(__builtin_uaddl_overflow) # define git__add_sizet_overflow(out, one, two) \ |