gfx/cairo/win32-inline-cpp-keyword.patch@b8a032363ba2
gfx/cairo/win32-inline-cpp-keyword.patch
Thu, 22 Jan 2015 13:21:57 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 22 Jan 2015 13:21:57 +0100
- branch
- TOR_BUG_9701
- changeset 15
- b8a032363ba2
- permissions
- -rw-r--r--
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
1 diff --git a/gfx/cairo/cairo/src/cairo-compiler-private.h b/gfx/cairo/cairo/src/cairo-compiler-private.h
2 --- a/gfx/cairo/cairo/src/cairo-compiler-private.h
3 +++ b/gfx/cairo/cairo/src/cairo-compiler-private.h
4 @@ -205,18 +205,20 @@
5 #if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER)
6 #define snprintf _snprintf
7 #define popen _popen
8 #define pclose _pclose
9 #define hypot _hypot
10 #endif
12 #ifdef _MSC_VER
13 +#ifndef __cplusplus
14 #undef inline
15 #define inline __inline
16 +#endif
18 /* there are currently linkage problems that arise when trying to include intrin.h in c++:
19 * D:\sdks\v7.0\include\winnt.h(3674) : error C2733: second C linkage of overloaded function '_interlockedbittestandset' not allowed
20 * so avoid defining ffs in c++ code for now */
21 #ifndef __cplusplus
22 /* Add a definition of ffs */
23 #include <intrin.h>
24 #pragma intrinsic(_BitScanForward)
