From 5f8de423f190bbb79a62f804151bc24824fa32d8 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 2 Feb 2018 04:16:08 -0500 Subject: Add m-esr52 at 52.6.0 --- gfx/cairo/win32-ffs-gcc.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 gfx/cairo/win32-ffs-gcc.patch (limited to 'gfx/cairo/win32-ffs-gcc.patch') diff --git a/gfx/cairo/win32-ffs-gcc.patch b/gfx/cairo/win32-ffs-gcc.patch new file mode 100644 index 000000000..e7cc1d1f6 --- /dev/null +++ b/gfx/cairo/win32-ffs-gcc.patch @@ -0,0 +1,25 @@ +diff --git a/gfx/cairo/cairo/src/cairo-compiler-private.h b/gfx/cairo/cairo/src/cairo-compiler-private.h +index ffac9ce..9a05831 100644 +--- a/gfx/cairo/cairo/src/cairo-compiler-private.h ++++ b/gfx/cairo/cairo/src/cairo-compiler-private.h +@@ -229,16 +229,20 @@ ffs (int x) + + if (_BitScanForward(&i, x) != 0) + return i + 1; + + return 0; + } + #endif + ++#elif defined(__WIN32__) && defined(__GNUC__) ++ ++#define ffs(x) __builtin_ffs(x) ++ + #endif + + #if defined(_MSC_VER) && defined(_M_IX86) + /* When compiling with /Gy and /OPT:ICF identical functions will be folded in together. + The CAIRO_ENSURE_UNIQUE macro ensures that a function is always unique and + will never be folded into another one. Something like this might eventually + be needed for GCC but it seems fine for now. */ + #define CAIRO_ENSURE_UNIQUE \ -- cgit v1.2.3