Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Mar 21, 2016
2 parents 937978e + d616fbf commit 2ab5c88
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions git-compat-util.h
Expand Up @@ -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)
{
Expand Down

0 comments on commit 2ab5c88

Please sign in to comment.