mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-02 18:08:58 +00:00
67a586f153
Removes patches which are no longer being applied to our import and updates the patches that are applied to the current upstream. Differential Revision: https://phabricator.services.mozilla.com/D161867
25 lines
666 B
Diff
25 lines
666 B
Diff
diff --git a/gfx/cairo/libpixman/src/pixman.h b/gfx/cairo/libpixman/src/pixman.h
|
|
--- a/gfx/cairo/libpixman/src/pixman.h
|
|
+++ b/gfx/cairo/libpixman/src/pixman.h
|
|
@@ -64,16 +64,20 @@ SOFTWARE.
|
|
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
* PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#ifndef PIXMAN_H__
|
|
#define PIXMAN_H__
|
|
|
|
+#ifdef MOZILLA_VERSION
|
|
+#include "cairo/pixman-rename.h"
|
|
+#endif
|
|
+
|
|
#include <pixman-version.h>
|
|
|
|
#ifdef __cplusplus
|
|
#define PIXMAN_BEGIN_DECLS extern "C" {
|
|
#define PIXMAN_END_DECLS }
|
|
#else
|
|
#define PIXMAN_BEGIN_DECLS
|
|
#define PIXMAN_END_DECLS
|