зеркало из https://github.com/mozilla/gecko-dev.git
Bug 332006: Remove an old cairo patch r=jrmuizel
This patch hasn't been touched in ten years and the code it affects does not appear in the file, so I think it is old an unused. Differential Revision: https://phabricator.services.mozilla.com/D159514
This commit is contained in:
Родитель
b095499aca
Коммит
f71c987669
|
@ -1,24 +0,0 @@
|
|||
diff --git a/gfx/cairo/cairo/src/cairo-compiler-private.h b/gfx/cairo/cairo/src/cairo-compiler-private.h
|
||||
--- a/gfx/cairo/cairo/src/cairo-compiler-private.h
|
||||
+++ b/gfx/cairo/cairo/src/cairo-compiler-private.h
|
||||
@@ -205,18 +205,20 @@
|
||||
#if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER)
|
||||
#define snprintf _snprintf
|
||||
#define popen _popen
|
||||
#define pclose _pclose
|
||||
#define hypot _hypot
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
+#ifndef __cplusplus
|
||||
#undef inline
|
||||
#define inline __inline
|
||||
+#endif
|
||||
|
||||
/* there are currently linkage problems that arise when trying to include intrin.h in c++:
|
||||
* D:\sdks\v7.0\include\winnt.h(3674) : error C2733: second C linkage of overloaded function '_interlockedbittestandset' not allowed
|
||||
* so avoid defining ffs in c++ code for now */
|
||||
#ifndef __cplusplus
|
||||
/* Add a definition of ffs */
|
||||
#include <intrin.h>
|
||||
#pragma intrinsic(_BitScanForward)
|
Загрузка…
Ссылка в новой задаче