gfx/cairo/pixman-export.patch@97036ab72558 (annotated)
gfx/cairo/pixman-export.patch
Tue, 06 Jan 2015 21:39:09 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 06 Jan 2015 21:39:09 +0100
- branch
- TOR_BUG_9701
- changeset 8
- 97036ab72558
- permissions
- -rw-r--r--
Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.
| michael@0 | 1 | diff --git a/gfx/cairo/libpixman/src/pixman-compiler.h b/gfx/cairo/libpixman/src/pixman-compiler.h |
| michael@0 | 2 | --- a/gfx/cairo/libpixman/src/pixman-compiler.h |
| michael@0 | 3 | +++ b/gfx/cairo/libpixman/src/pixman-compiler.h |
| michael@0 | 4 | @@ -59,26 +59,33 @@ |
| michael@0 | 5 | # ifndef force_inline |
| michael@0 | 6 | # define force_inline inline |
| michael@0 | 7 | # endif |
| michael@0 | 8 | # ifndef noinline |
| michael@0 | 9 | # define noinline |
| michael@0 | 10 | # endif |
| michael@0 | 11 | #endif |
| michael@0 | 12 | |
| michael@0 | 13 | +/* In libxul builds we don't ever want to export pixman symbols */ |
| michael@0 | 14 | +#if 1 |
| michael@0 | 15 | +# define PIXMAN_EXPORT cairo_public |
| michael@0 | 16 | +#else |
| michael@0 | 17 | + |
| michael@0 | 18 | /* GCC visibility */ |
| michael@0 | 19 | #if defined(__GNUC__) && __GNUC__ >= 4 && !defined(_WIN32) |
| michael@0 | 20 | # define PIXMAN_EXPORT __attribute__ ((visibility("default"))) |
| michael@0 | 21 | /* Sun Studio 8 visibility */ |
| michael@0 | 22 | #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) |
| michael@0 | 23 | # define PIXMAN_EXPORT __global |
| michael@0 | 24 | #else |
| michael@0 | 25 | # define PIXMAN_EXPORT |
| michael@0 | 26 | #endif |
| michael@0 | 27 | |
| michael@0 | 28 | +#endif |
| michael@0 | 29 | + |
| michael@0 | 30 | /* TLS */ |
| michael@0 | 31 | #if defined(PIXMAN_NO_TLS) |
| michael@0 | 32 | |
| michael@0 | 33 | # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \ |
| michael@0 | 34 | static type name |
| michael@0 | 35 | # define PIXMAN_GET_THREAD_LOCAL(name) \ |
| michael@0 | 36 | (&name) |
| michael@0 | 37 |
