Merge mozilla-central to autoland. CLOSED TREE
[gecko.git] / gfx / cairo / 02-cplusplus-no-register.patch
blob30de2a2dc67a78a2b18abfa8eec5f43632017b43
1 diff --git a/gfx/cairo/cairo/src/cairoint.h b/gfx/cairo/cairo/src/cairoint.h
2 --- a/gfx/cairo/cairo/src/cairoint.h
3 +++ b/gfx/cairo/cairo/src/cairoint.h
4 @@ -190,7 +190,11 @@ static inline int cairo_const
5 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
6 return __builtin_popcount (mask);
7 #else
8 +#ifdef __cplusplus
9 + int y;
10 +#else
11 register int y;
12 +#endif
14 y = (mask >> 1) &033333333333;
15 y = mask - y - ((y >>1) & 033333333333);