gfx/cairo/pixman-export.patch

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.

     1 diff --git a/gfx/cairo/libpixman/src/pixman-compiler.h b/gfx/cairo/libpixman/src/pixman-compiler.h
     2 --- a/gfx/cairo/libpixman/src/pixman-compiler.h
     3 +++ b/gfx/cairo/libpixman/src/pixman-compiler.h
     4 @@ -59,26 +59,33 @@
     5  #   ifndef force_inline
     6  #      define force_inline inline
     7  #   endif
     8  #   ifndef noinline
     9  #      define noinline
    10  #   endif
    11  #endif
    13 +/* In libxul builds we don't ever want to export pixman symbols */
    14 +#if 1
    15 +#   define PIXMAN_EXPORT cairo_public
    16 +#else
    17 +
    18  /* GCC visibility */
    19  #if defined(__GNUC__) && __GNUC__ >= 4 && !defined(_WIN32)
    20  #   define PIXMAN_EXPORT __attribute__ ((visibility("default")))
    21  /* Sun Studio 8 visibility */
    22  #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
    23  #   define PIXMAN_EXPORT __global
    24  #else
    25  #   define PIXMAN_EXPORT
    26  #endif
    28 +#endif
    29 +
    30  /* TLS */
    31  #if defined(PIXMAN_NO_TLS)
    33  #   define PIXMAN_DEFINE_THREAD_LOCAL(type, name)			\
    34      static type name
    35  #   define PIXMAN_GET_THREAD_LOCAL(name)				\
    36      (&name)

mercurial