Commit 6f049e5c authored by Jack Andersen's avatar Jack Andersen

Rename `generic` to `_generic` to avoid C++/CX conflict

parent b5f9faac
......@@ -1050,7 +1050,7 @@ FT_BEGIN_HEADER
FT_Int num_charmaps;
FT_CharMap* charmaps;
FT_Generic generic;
FT_Generic _generic;
/*# The following member variables (down to `underline_thickness') */
/*# are only relevant to scalable outlines; cf. @FT_Bitmap_Size */
......@@ -1536,7 +1536,7 @@ FT_BEGIN_HEADER
typedef struct FT_SizeRec_
{
FT_Face face; /* parent face object */
FT_Generic generic; /* generic pointer for client uses */
FT_Generic _generic; /* generic pointer for client uses */
FT_Size_Metrics metrics; /* size metrics */
FT_Size_Internal internal;
......@@ -1748,7 +1748,7 @@ FT_BEGIN_HEADER
FT_Face face;
FT_GlyphSlot next;
FT_UInt reserved; /* retained for binary compatibility */
FT_Generic generic;
FT_Generic _generic;
FT_Glyph_Metrics metrics;
FT_Fixed linearHoriAdvance;
......
......@@ -485,8 +485,8 @@
prev->next = cur->next;
/* finalize client-specific data */
if ( slot->generic.finalizer )
slot->generic.finalizer( slot );
if ( slot->_generic.finalizer )
slot->_generic.finalizer( slot );
ft_glyphslot_done( slot );
FT_FREE( slot );
......@@ -880,8 +880,8 @@
FT_Driver driver )
{
/* finalize client-specific data */
if ( size->generic.finalizer )
size->generic.finalizer( size );
if ( size->_generic.finalizer )
size->_generic.finalizer( size );
/* finalize format-specific stuff */
if ( driver->clazz->done_size )
......@@ -947,8 +947,8 @@
face->size = NULL;
/* now discard client data */
if ( face->generic.finalizer )
face->generic.finalizer( face );
if ( face->_generic.finalizer )
face->_generic.finalizer( face );
/* discard charmaps */
destroy_charmaps( face, memory );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment