diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-06 21:06:15 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-07 14:49:48 +0100 |
| commit | 7efd71616ec5efedbe626a986a707c35d3cac323 (patch) | |
| tree | 0223e8271d9d18763efd743f43f98b8b8b9e5c2e /gfx/cairo/pixman-xp-dll-workaround | |
| parent | bbc2206a0fda053a6f5071b457bd209dab9ed268 (diff) | |
| download | UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.gz UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.lz UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.xz UXP-7efd71616ec5efedbe626a986a707c35d3cac323.zip | |
Issue #1274 - Part 1: Adopt the cairo version as our own.
- Move header licensing from tri-license to MPL 2.0. MPL-compatible
other licensing has been retained where originally present.
- Remove individual superseded licensing terms.
- Remove patches, outdated readmes & incomplete patch summaries.
- Remove incomplete cairo release notes (only went up to 1.6.4 anyway).
- Rewrite COPYING to indicate the current state of the library in tree.
Diffstat (limited to 'gfx/cairo/pixman-xp-dll-workaround')
| -rw-r--r-- | gfx/cairo/pixman-xp-dll-workaround | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/gfx/cairo/pixman-xp-dll-workaround b/gfx/cairo/pixman-xp-dll-workaround deleted file mode 100644 index e5d1fcbf8..000000000 --- a/gfx/cairo/pixman-xp-dll-workaround +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/gfx/cairo/libpixman/src/pixman-compiler.h b/gfx/cairo/libpixman/src/pixman-compiler.h ---- a/gfx/cairo/libpixman/src/pixman-compiler.h -+++ b/gfx/cairo/libpixman/src/pixman-compiler.h -@@ -114,20 +114,22 @@ - - #elif defined(TLS) - - # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \ - static TLS type name - # define PIXMAN_GET_THREAD_LOCAL(name) \ - (&name) - --#elif defined(__MINGW32__) -+#elif defined(__MINGW32__) || defined(PIXMAN_USE_XP_DLL_TLS_WORKAROUND) - - # define _NO_W32_PSEUDO_MODIFIERS - # include <windows.h> -+#undef IN -+#undef OUT - - # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \ - static volatile int tls_ ## name ## _initialized = 0; \ - static void *tls_ ## name ## _mutex = NULL; \ - static unsigned tls_ ## name ## _index; \ - \ - static type * \ - tls_ ## name ## _alloc (void) \ |