michael@0: diff --git a/gfx/cairo/libpixman/src/pixman-compiler.h b/gfx/cairo/libpixman/src/pixman-compiler.h
michael@0: --- a/gfx/cairo/libpixman/src/pixman-compiler.h
michael@0: +++ b/gfx/cairo/libpixman/src/pixman-compiler.h
michael@0: @@ -114,20 +114,22 @@
michael@0:  
michael@0:  #elif defined(TLS)
michael@0:  
michael@0:  #   define PIXMAN_DEFINE_THREAD_LOCAL(type, name)			\
michael@0:      static TLS type name
michael@0:  #   define PIXMAN_GET_THREAD_LOCAL(name)				\
michael@0:      (&name)
michael@0:  
michael@0: -#elif defined(__MINGW32__)
michael@0: +#elif defined(__MINGW32__) || defined(PIXMAN_USE_XP_DLL_TLS_WORKAROUND)
michael@0:  
michael@0:  #   define _NO_W32_PSEUDO_MODIFIERS
michael@0:  #   include <windows.h>
michael@0: +#undef IN
michael@0: +#undef OUT
michael@0:  
michael@0:  #   define PIXMAN_DEFINE_THREAD_LOCAL(type, name)			\
michael@0:      static volatile int tls_ ## name ## _initialized = 0;		\
michael@0:      static void *tls_ ## name ## _mutex = NULL;				\
michael@0:      static unsigned tls_ ## name ## _index;				\
michael@0:  									\
michael@0:      static type *							\
michael@0:      tls_ ## name ## _alloc (void)					\