gfx/cairo/win32-inline-cpp-keyword.patch@b8a032363ba2 (annotated)
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
| michael@0 | 1 | diff --git a/gfx/cairo/cairo/src/cairo-compiler-private.h b/gfx/cairo/cairo/src/cairo-compiler-private.h |
| michael@0 | 2 | --- a/gfx/cairo/cairo/src/cairo-compiler-private.h |
| michael@0 | 3 | +++ b/gfx/cairo/cairo/src/cairo-compiler-private.h |
| michael@0 | 4 | @@ -205,18 +205,20 @@ |
| michael@0 | 5 | #if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER) |
| michael@0 | 6 | #define snprintf _snprintf |
| michael@0 | 7 | #define popen _popen |
| michael@0 | 8 | #define pclose _pclose |
| michael@0 | 9 | #define hypot _hypot |
| michael@0 | 10 | #endif |
| michael@0 | 11 | |
| michael@0 | 12 | #ifdef _MSC_VER |
| michael@0 | 13 | +#ifndef __cplusplus |
| michael@0 | 14 | #undef inline |
| michael@0 | 15 | #define inline __inline |
| michael@0 | 16 | +#endif |
| michael@0 | 17 | |
| michael@0 | 18 | /* there are currently linkage problems that arise when trying to include intrin.h in c++: |
| michael@0 | 19 | * D:\sdks\v7.0\include\winnt.h(3674) : error C2733: second C linkage of overloaded function '_interlockedbittestandset' not allowed |
| michael@0 | 20 | * so avoid defining ffs in c++ code for now */ |
| michael@0 | 21 | #ifndef __cplusplus |
| michael@0 | 22 | /* Add a definition of ffs */ |
| michael@0 | 23 | #include <intrin.h> |
| michael@0 | 24 | #pragma intrinsic(_BitScanForward) |
