From d1b6d76b863122d905dea7728ea2e640e40199e0 Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Mon, 6 May 2024 19:25:14 +0000 Subject: [PATCH] Bug 1892913 - patch 4 - Avoid redefinition of cairo_public. r=gfx-reviewers,lsalzman Differential Revision: https://phabricator.services.mozilla.com/D209411 --- gfx/cairo/00-cairo_public.patch | 21 +++++++++++++++++++++ gfx/cairo/cairo/src/cairo.h | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 gfx/cairo/00-cairo_public.patch diff --git a/gfx/cairo/00-cairo_public.patch b/gfx/cairo/00-cairo_public.patch new file mode 100644 index 000000000000..3d718b0214cc --- /dev/null +++ b/gfx/cairo/00-cairo_public.patch @@ -0,0 +1,21 @@ +# HG changeset patch +# User Jonathan Kew +# Date 1713882230 -3600 +# Tue Apr 23 15:23:50 2024 +0100 +# Node ID 18ffa0ace007ca3b1acb66c9081089ea2d2e0917 +# Parent 8f822dbadb73fcfb8765937ea6bdfbaed5bd0c2c +Avoid redefinition of cairo_public + +diff --git a/gfx/cairo/cairo/src/cairo.h b/gfx/cairo/cairo/src/cairo.h +--- a/gfx/cairo/cairo/src/cairo.h ++++ b/gfx/cairo/cairo/src/cairo.h +@@ -67,7 +67,9 @@ + # define _cairo_api _cairo_import + #endif + ++#ifndef cairo_public + #define cairo_public _cairo_api extern ++#endif + + CAIRO_BEGIN_DECLS + diff --git a/gfx/cairo/cairo/src/cairo.h b/gfx/cairo/cairo/src/cairo.h index 89e4a070e63d..97b9529bf4c9 100644 --- a/gfx/cairo/cairo/src/cairo.h +++ b/gfx/cairo/cairo/src/cairo.h @@ -67,7 +67,9 @@ # define _cairo_api _cairo_import #endif +#ifndef cairo_public #define cairo_public _cairo_api extern +#endif CAIRO_BEGIN_DECLS