gfx/cairo/win32-ffs-gcc.patch

Wed, 31 Dec 2014 06:09:35 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 31 Dec 2014 06:09:35 +0100
changeset 0
6474c204b198
permissions
-rw-r--r--

Cloned upstream origin tor-browser at tor-browser-31.3.0esr-4.5-1-build1
revision ID fc1c9ff7c1b2defdbc039f12214767608f46423f for hacking purpose.

     1 diff --git a/gfx/cairo/cairo/src/cairo-compiler-private.h b/gfx/cairo/cairo/src/cairo-compiler-private.h
     2 index ffac9ce..9a05831 100644
     3 --- a/gfx/cairo/cairo/src/cairo-compiler-private.h
     4 +++ b/gfx/cairo/cairo/src/cairo-compiler-private.h
     5 @@ -229,16 +229,20 @@ ffs (int x)
     7      if (_BitScanForward(&i, x) != 0)
     8  	return i + 1;
    10      return 0;
    11  }
    12  #endif
    14 +#elif defined(__WIN32__) && defined(__GNUC__)
    15 +
    16 +#define ffs(x) __builtin_ffs(x)
    17 +
    18  #endif
    20  #if defined(_MSC_VER) && defined(_M_IX86)
    21  /* When compiling with /Gy and /OPT:ICF identical functions will be folded in together.
    22     The CAIRO_ENSURE_UNIQUE macro ensures that a function is always unique and
    23     will never be folded into another one. Something like this might eventually
    24     be needed for GCC but it seems fine for now. */
    25  #define CAIRO_ENSURE_UNIQUE                       \

mercurial