gfx/cairo/pixman-xp-dll-workaround@129ffea94266 (annotated)
gfx/cairo/pixman-xp-dll-workaround
Sat, 03 Jan 2015 20:18:00 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 03 Jan 2015 20:18:00 +0100
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
- permissions
- -rw-r--r--
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
| 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 | @@ -114,20 +114,22 @@ |
| michael@0 | 5 | |
| michael@0 | 6 | #elif defined(TLS) |
| michael@0 | 7 | |
| michael@0 | 8 | # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \ |
| michael@0 | 9 | static TLS type name |
| michael@0 | 10 | # define PIXMAN_GET_THREAD_LOCAL(name) \ |
| michael@0 | 11 | (&name) |
| michael@0 | 12 | |
| michael@0 | 13 | -#elif defined(__MINGW32__) |
| michael@0 | 14 | +#elif defined(__MINGW32__) || defined(PIXMAN_USE_XP_DLL_TLS_WORKAROUND) |
| michael@0 | 15 | |
| michael@0 | 16 | # define _NO_W32_PSEUDO_MODIFIERS |
| michael@0 | 17 | # include <windows.h> |
| michael@0 | 18 | +#undef IN |
| michael@0 | 19 | +#undef OUT |
| michael@0 | 20 | |
| michael@0 | 21 | # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \ |
| michael@0 | 22 | static volatile int tls_ ## name ## _initialized = 0; \ |
| michael@0 | 23 | static void *tls_ ## name ## _mutex = NULL; \ |
| michael@0 | 24 | static unsigned tls_ ## name ## _index; \ |
| michael@0 | 25 | \ |
| michael@0 | 26 | static type * \ |
| michael@0 | 27 | tls_ ## name ## _alloc (void) \ |
