walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[GX] Fix build with some compilers 

Eg. https://ci.appveyor.com/project/behdad/harfbuzz/build/1.0.48/job/o9mnd33kcdeeg30r

hb-open-type-private.hh:103:29: error: static data member 'OT::Device::<anonymous union>::<anonymous struct>::static_size' in unnamed class [-fpermissive]
This commit is contained in:
Behdad Esfahbod 2016-09-10 00:01:10 -07:00
parent 250bcd6fb6
commit 1f6ed356e0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hb-ot-layout-common-private.hh
View File

@ -1445,6 +1445,17 @@ struct VariationDevice
DEFINE_SIZE_STATIC (6); DEFINE_SIZE_STATIC (6);
}; };
struct DeviceHeader
{
protected:
USHORT reserved1;
USHORT reserved2;
public:
USHORT format; /* Format identifier */
public:
DEFINE_SIZE_STATIC (6);
};
struct Device struct Device
{ {
inline hb_position_t get_x_delta (hb_font_t *font, const VarStore &store) const inline hb_position_t get_x_delta (hb_font_t *font, const VarStore &store) const
@ -1488,13 +1499,7 @@ struct Device
protected: protected:
union { union {
struct { DeviceHeader b;
USHORT reserved1;
USHORT reserved2;
USHORT format; /* Format identifier */
public:
DEFINE_SIZE_STATIC (6);
} b;
HintingDevice hinting; HintingDevice hinting;
VariationDevice variation; VariationDevice variation;
} u; } u;