1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/cairo/win32-inline-cpp-keyword.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,24 @@
1.4 +diff --git a/gfx/cairo/cairo/src/cairo-compiler-private.h b/gfx/cairo/cairo/src/cairo-compiler-private.h
1.5 +--- a/gfx/cairo/cairo/src/cairo-compiler-private.h
1.6 ++++ b/gfx/cairo/cairo/src/cairo-compiler-private.h
1.7 +@@ -205,18 +205,20 @@
1.8 + #if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER)
1.9 + #define snprintf _snprintf
1.10 + #define popen _popen
1.11 + #define pclose _pclose
1.12 + #define hypot _hypot
1.13 + #endif
1.14 +
1.15 + #ifdef _MSC_VER
1.16 ++#ifndef __cplusplus
1.17 + #undef inline
1.18 + #define inline __inline
1.19 ++#endif
1.20 +
1.21 + /* there are currently linkage problems that arise when trying to include intrin.h in c++:
1.22 + * D:\sdks\v7.0\include\winnt.h(3674) : error C2733: second C linkage of overloaded function '_interlockedbittestandset' not allowed
1.23 + * so avoid defining ffs in c++ code for now */
1.24 + #ifndef __cplusplus
1.25 + /* Add a definition of ffs */
1.26 + #include <intrin.h>
1.27 + #pragma intrinsic(_BitScanForward)
