22-windows-build-fix.patch (2735B)
1 # HG changeset patch 2 # User Jonathan Kew <jkew@mozilla.com> 3 # Date 1714037079 -3600 4 # Thu Apr 25 10:24:39 2024 +0100 5 # Node ID 796a9cf6d3d64e08056fe7583e7de11066729130 6 # Parent c150548d5702cdf69be21a30407b4ce75d5b662d 7 Bug 1892913 - patch 20 - Add #ifdef guards around mingw-specific __CRT_UUID_DECL lines in d2d1-extra.h 8 9 To fix the Gecko build on Windows, as this is a mingw-ism that isn't 10 supported or needed. 11 12 diff --git a/gfx/cairo/cairo/src/win32/d2d1-extra.h b/gfx/cairo/cairo/src/win32/d2d1-extra.h 13 --- a/gfx/cairo/cairo/src/win32/d2d1-extra.h 14 +++ b/gfx/cairo/cairo/src/win32/d2d1-extra.h 15 @@ -39,7 +39,10 @@ ID2D1DeviceContext1 : public ID2D1Device 16 virtual void STDMETHODCALLTYPE CreateStrokedGeometryRealization() = 0; 17 virtual void STDMETHODCALLTYPE DrawGeometryRealization() = 0; 18 }; 19 +#ifdef __CRT_UUID_DECL 20 __CRT_UUID_DECL(ID2D1DeviceContext1, 0xd37f57e4, 0x6908, 0x459f, 0xa1, 0x99, 0xe7, 0x2f, 0x24, 0xf7, 0x99, 0x87) 21 +#endif 22 + 23 24 DEFINE_GUID(IID_ID2D1DeviceContext2, 0x394ea6a3, 0x0c34, 0x4321, 0x95, 0x0b, 0x6c, 0xa2, 0x0f, 0x0b, 0xe6, 0xc7); 25 MIDL_INTERFACE("394ea6a3-0c34-4321-950b-6ca20f0be6c7") 26 @@ -57,7 +60,9 @@ ID2D1DeviceContext2 : public ID2D1Device 27 virtual void STDMETHODCALLTYPE DrawGdiMetafile() = 0; 28 virtual void STDMETHODCALLTYPE CreateTransformedImageSource() = 0; 29 }; 30 +#ifdef __CRT_UUID_DECL 31 __CRT_UUID_DECL(ID2D1DeviceContext2, 0x394ea6a3, 0x0c34, 0x4321, 0x95, 0x0b, 0x6c, 0xa2, 0x0f, 0x0b, 0xe6, 0xc7) 32 +#endif 33 34 35 DEFINE_GUID(IID_ID2D1DeviceContext3, 0x235a7496, 0x8351, 0x414c, 0xbc, 0xd4, 0x66, 0x72, 0xab, 0x2d, 0x8e, 0x00); 36 @@ -67,7 +72,9 @@ ID2D1DeviceContext3 : public ID2D1Device 37 virtual void STDMETHODCALLTYPE CreateSpriteBatch() = 0; 38 virtual void STDMETHODCALLTYPE DrawSpriteBatch() = 0; 39 }; 40 +#ifdef __CRT_UUID_DECL 41 __CRT_UUID_DECL(ID2D1DeviceContext3, 0x235a7496, 0x8351, 0x414c, 0xbc, 0xd4, 0x66, 0x72, 0xab, 0x2d, 0x8e, 0x00) 42 +#endif 43 44 45 DEFINE_GUID(IID_ID2D1SvgGlyphStyle, 0xaf671749, 0xd241, 0x4db8, 0x8e, 0x41, 0xdc, 0xc2, 0xe5, 0xc1, 0xa4, 0x38); 46 @@ -80,7 +87,9 @@ ID2D1SvgGlyphStyle : public ID2D1Resour 47 virtual void STDMETHODCALLTYPE GetStrokeDashesCount() = 0; 48 virtual void STDMETHODCALLTYPE GetStroke() = 0; 49 }; 50 +#ifdef __CRT_UUID_DECL 51 __CRT_UUID_DECL(ID2D1SvgGlyphStyle, 0xaf671749, 0xd241, 0x4db8, 0x8e, 0x41, 0xdc, 0xc2, 0xe5, 0xc1, 0xa4, 0x38) 52 +#endif 53 54 55 DEFINE_GUID(IID_ID2D1DeviceContext4, 0x8c427831, 0x3d90, 0x4476, 0xb6, 0x47, 0xc4, 0xfa, 0xe3, 0x49, 0xe4, 0xdb); 56 @@ -106,6 +115,8 @@ ID2D1DeviceContext4 : public ID2D1Device 57 DWRITE_MEASURING_MODE measuringMode) = 0; 58 59 }; 60 +#ifdef __CRT_UUID_DECL 61 __CRT_UUID_DECL(ID2D1DeviceContext4, 0x8c427831, 0x3d90, 0x4476, 0xb6, 0x47, 0xc4, 0xfa, 0xe3, 0x49, 0xe4, 0xdb) 62 +#endif 63 64 #endif