gfx/cairo/win32-ffs-gcc.patch@deefc01c0e14
gfx/cairo/win32-ffs-gcc.patch
Thu, 15 Jan 2015 21:03:48 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 15 Jan 2015 21:03:48 +0100
- branch
- TOR_BUG_9701
- changeset 11
- deefc01c0e14
- permissions
- -rw-r--r--
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
1 diff --git a/gfx/cairo/cairo/src/cairo-compiler-private.h b/gfx/cairo/cairo/src/cairo-compiler-private.h
2 index ffac9ce..9a05831 100644
3 --- a/gfx/cairo/cairo/src/cairo-compiler-private.h
4 +++ b/gfx/cairo/cairo/src/cairo-compiler-private.h
5 @@ -229,16 +229,20 @@ ffs (int x)
7 if (_BitScanForward(&i, x) != 0)
8 return i + 1;
10 return 0;
11 }
12 #endif
14 +#elif defined(__WIN32__) && defined(__GNUC__)
15 +
16 +#define ffs(x) __builtin_ffs(x)
17 +
18 #endif
20 #if defined(_MSC_VER) && defined(_M_IX86)
21 /* When compiling with /Gy and /OPT:ICF identical functions will be folded in together.
22 The CAIRO_ENSURE_UNIQUE macro ensures that a function is always unique and
23 will never be folded into another one. Something like this might eventually
24 be needed for GCC but it seems fine for now. */
25 #define CAIRO_ENSURE_UNIQUE \
