summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-21 09:19:27 -0700
committerJunio C Hamano <gitster@pobox.com>2016-03-21 09:19:27 -0700
commit2ab5c88642e96b6cba17079d008531f5647d33cf (patch)
tree887e1953a76de93207eaa6046de9f4de578cd092
parent937978e0f3e750d917768c77665d5f8cfbd802b6 (diff)
parentd616fbf256ef3102669d450ddadd8469fefcf95c (diff)
downloadgit-2ab5c88642e96b6cba17079d008531f5647d33cf.tar.gz
Merge branch 'es/st-add4-gcc-4.2-workaround' into maint
* es/st-add4-gcc-4.2-workaround: git-compat-util: st_add4: work around gcc 4.2.x compiler crash
-rw-r--r--git-compat-util.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index c07e0c1778..474395471f 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -715,8 +715,8 @@ static inline size_t st_add(size_t a, size_t b)
(uintmax_t)a, (uintmax_t)b);
return a + b;
}
-#define st_add3(a,b,c) st_add((a),st_add((b),(c)))
-#define st_add4(a,b,c,d) st_add((a),st_add3((b),(c),(d)))
+#define st_add3(a,b,c) st_add(st_add((a),(b)),(c))
+#define st_add4(a,b,c,d) st_add(st_add3((a),(b),(c)),(d))
static inline size_t st_mult(size_t a, size_t b)
{