Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1892913 - patch 4 - Avoid redefinition of cairo_public. r=gfx-reviewers,lsalzman

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D209411
This commit is contained in:
Jonathan Kew 2024-05-06 19:25:14 +00:00
parent 4ea66d784e
commit d1b6d76b86
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gfx/cairo/00-cairo_public.patch Normal file
View File

@ -0,0 +1,21 @@
# HG changeset patch
# User Jonathan Kew <jkew@mozilla.com>
# 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

2
gfx/cairo/cairo/src/cairo.h
View File

@ -67,7 +67,9 @@
# define _cairo_api _cairo_import
#endif
#ifndef cairo_public
#define cairo_public _cairo_api extern
#endif
CAIRO_BEGIN_DECLS