diff options
| author | Moonchild <moonchild@palemoon.org> | 2019-11-08 10:54:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 10:54:27 +0100 |
| commit | 0f3635dc8fac240b5e6d2a74d8894d83176bc357 (patch) | |
| tree | 91f42e5b7b611e259ae8fb63f84e201032e56382 /gfx/cairo/pixman-xp-dll-workaround | |
| parent | 8bb208397d2574ffcad436d23d3e8b87b3413141 (diff) | |
| parent | 5f80c286cf845cbc1dde8b7d6ea177ddd4f8f39b (diff) | |
| download | UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar.gz UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar.lz UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar.xz UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.zip | |
Merge pull request #1276 from MoonchildProductions/cairo-work
Update the in-tree cairo code.
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) \ |