michael@0: diff --git a/gfx/cairo/cairo/src/cairo-compiler-private.h b/gfx/cairo/cairo/src/cairo-compiler-private.h
michael@0: --- a/gfx/cairo/cairo/src/cairo-compiler-private.h
michael@0: +++ b/gfx/cairo/cairo/src/cairo-compiler-private.h
michael@0: @@ -205,18 +205,20 @@
michael@0:  #if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER)
michael@0:  #define snprintf _snprintf
michael@0:  #define popen _popen
michael@0:  #define pclose _pclose
michael@0:  #define hypot _hypot
michael@0:  #endif
michael@0:  
michael@0:  #ifdef _MSC_VER
michael@0: +#ifndef __cplusplus
michael@0:  #undef inline
michael@0:  #define inline __inline
michael@0: +#endif
michael@0:  
michael@0:  /* there are currently linkage problems that arise when trying to include intrin.h in c++:
michael@0:   * D:\sdks\v7.0\include\winnt.h(3674) : error C2733: second C linkage of overloaded function '_interlockedbittestandset' not allowed
michael@0:   * so avoid defining ffs in c++ code for now */
michael@0:  #ifndef  __cplusplus
michael@0:  /* Add a definition of ffs */
michael@0:  #include <intrin.h>
michael@0:  #pragma intrinsic(_BitScanForward)