diff --git a/include/freetype/internal/ftdrv.h b/include/freetype/internal/ftdrv.h index 5609b3ef1..ca6134d22 100644 --- a/include/freetype/internal/ftdrv.h +++ b/include/freetype/internal/ftdrv.h @@ -162,7 +162,7 @@ FT_BEGIN_HEADER * Most function pointers, with the exception of `load_glyph`, can be set * to 0 to indicate a default behaviour. */ - typedef struct FT_Driver_ClassRec_ + typedef const struct FT_Driver_ClassRec_ { FT_Module_Class root; @@ -216,7 +216,7 @@ FT_BEGIN_HEADER */ #define FT_DECLARE_DRIVER( class_ ) \ FT_CALLBACK_TABLE \ - const FT_Driver_ClassRec class_; + FT_Driver_ClassRec class_; #define FT_DEFINE_DRIVER( \ class_, \ @@ -245,7 +245,7 @@ FT_BEGIN_HEADER request_size_, \ select_size_ ) \ FT_CALLBACK_TABLE_DEF \ - const FT_Driver_ClassRec class_ = \ + FT_Driver_ClassRec class_ = \ { \ FT_DEFINE_ROOT_MODULE( flags_, \ size_, \ diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c index f57bb0007..a18dc7acd 100644 --- a/src/bdf/bdfdrivr.c +++ b/src/bdf/bdfdrivr.c @@ -985,7 +985,7 @@ THE SOFTWARE. FT_CALLBACK_TABLE_DEF - const FT_Driver_ClassRec bdf_driver_class = + FT_Driver_ClassRec bdf_driver_class = { { FT_MODULE_FONT_DRIVER | diff --git a/src/bdf/bdfdrivr.h b/src/bdf/bdfdrivr.h index 54aaa3353..58bcaec3c 100644 --- a/src/bdf/bdfdrivr.h +++ b/src/bdf/bdfdrivr.h @@ -60,7 +60,7 @@ FT_BEGIN_HEADER } BDF_FaceRec, *BDF_Face; - FT_EXPORT_VAR( const FT_Driver_ClassRec ) bdf_driver_class; + FT_EXPORT_VAR( FT_Driver_ClassRec ) bdf_driver_class; FT_END_HEADER diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c index 4be8a5c00..6da979b6f 100644 --- a/src/cid/cidriver.c +++ b/src/cid/cidriver.c @@ -230,7 +230,7 @@ FT_CALLBACK_TABLE_DEF - const FT_Driver_ClassRec t1cid_driver_class = + FT_Driver_ClassRec t1cid_driver_class = { { FT_MODULE_FONT_DRIVER | diff --git a/src/cid/cidriver.h b/src/cid/cidriver.h index 7ddce431c..c5fecfbcf 100644 --- a/src/cid/cidriver.h +++ b/src/cid/cidriver.h @@ -26,7 +26,7 @@ FT_BEGIN_HEADER FT_CALLBACK_TABLE - const FT_Driver_ClassRec t1cid_driver_class; + FT_Driver_ClassRec t1cid_driver_class; FT_END_HEADER diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c index ecd684951..0a1a12834 100644 --- a/src/pcf/pcfdrivr.c +++ b/src/pcf/pcfdrivr.c @@ -793,7 +793,7 @@ THE SOFTWARE. FT_CALLBACK_TABLE_DEF - const FT_Driver_ClassRec pcf_driver_class = + FT_Driver_ClassRec pcf_driver_class = { { FT_MODULE_FONT_DRIVER | diff --git a/src/pcf/pcfdrivr.h b/src/pcf/pcfdrivr.h index d46539374..9f044f3d5 100644 --- a/src/pcf/pcfdrivr.h +++ b/src/pcf/pcfdrivr.h @@ -33,7 +33,7 @@ THE SOFTWARE. FT_BEGIN_HEADER - FT_EXPORT_VAR( const FT_Driver_ClassRec ) pcf_driver_class; + FT_EXPORT_VAR( FT_Driver_ClassRec ) pcf_driver_class; FT_END_HEADER diff --git a/src/pfr/pfrdrivr.c b/src/pfr/pfrdrivr.c index ffd822273..dc7e90558 100644 --- a/src/pfr/pfrdrivr.c +++ b/src/pfr/pfrdrivr.c @@ -168,7 +168,7 @@ FT_CALLBACK_TABLE_DEF - const FT_Driver_ClassRec pfr_driver_class = + FT_Driver_ClassRec pfr_driver_class = { { FT_MODULE_FONT_DRIVER | diff --git a/src/pfr/pfrdrivr.h b/src/pfr/pfrdrivr.h index 58954a9af..a07f6451b 100644 --- a/src/pfr/pfrdrivr.h +++ b/src/pfr/pfrdrivr.h @@ -25,7 +25,7 @@ FT_BEGIN_HEADER - FT_EXPORT_VAR( const FT_Driver_ClassRec ) pfr_driver_class; + FT_EXPORT_VAR( FT_Driver_ClassRec ) pfr_driver_class; FT_END_HEADER diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c index 8ed01914a..b3ac4be75 100644 --- a/src/type1/t1driver.c +++ b/src/type1/t1driver.c @@ -757,7 +757,7 @@ FT_CALLBACK_TABLE_DEF - const FT_Driver_ClassRec t1_driver_class = + FT_Driver_ClassRec t1_driver_class = { { FT_MODULE_FONT_DRIVER | diff --git a/src/type1/t1driver.h b/src/type1/t1driver.h index 5ff52b55b..14899c1d8 100644 --- a/src/type1/t1driver.h +++ b/src/type1/t1driver.h @@ -25,7 +25,7 @@ FT_BEGIN_HEADER - FT_EXPORT_VAR( const FT_Driver_ClassRec ) t1_driver_class; + FT_EXPORT_VAR( FT_Driver_ClassRec ) t1_driver_class; FT_END_HEADER diff --git a/src/type42/t42drivr.c b/src/type42/t42drivr.c index 25f507f15..fe85a362e 100644 --- a/src/type42/t42drivr.c +++ b/src/type42/t42drivr.c @@ -199,7 +199,7 @@ } - const FT_Driver_ClassRec t42_driver_class = + FT_Driver_ClassRec t42_driver_class = { { FT_MODULE_FONT_DRIVER | diff --git a/src/type42/t42drivr.h b/src/type42/t42drivr.h index 5b3852b86..a49fcb3a9 100644 --- a/src/type42/t42drivr.h +++ b/src/type42/t42drivr.h @@ -25,7 +25,7 @@ FT_BEGIN_HEADER - FT_EXPORT_VAR( const FT_Driver_ClassRec ) t42_driver_class; + FT_EXPORT_VAR( FT_Driver_ClassRec ) t42_driver_class; FT_END_HEADER diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index daa39bea1..43057877a 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -1176,7 +1176,7 @@ FT_CALLBACK_TABLE_DEF - const FT_Driver_ClassRec winfnt_driver_class = + FT_Driver_ClassRec winfnt_driver_class = { { FT_MODULE_FONT_DRIVER | diff --git a/src/winfonts/winfnt.h b/src/winfonts/winfnt.h index 78137496f..578d1b5cb 100644 --- a/src/winfonts/winfnt.h +++ b/src/winfonts/winfnt.h @@ -152,7 +152,7 @@ FT_BEGIN_HEADER } FNT_FaceRec, *FNT_Face; - FT_EXPORT_VAR( const FT_Driver_ClassRec ) winfnt_driver_class; + FT_EXPORT_VAR( FT_Driver_ClassRec ) winfnt_driver_class; FT_END_HEADER