diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-12 18:20:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-12 18:20:04 +0000 |
| commit | da8fe31a7ba4acf109097d5696ad0145b991cdfd (patch) | |
| tree | 1c74d6f075702a73e557872f2a6f020ea4eb5432 /freetype/include | |
| parent | 6590f805a12779909cb8504c230fa367148fe38c (diff) | |
| parent | 529dcfd0858d75cb3c87c73cb0f81dd20bbb9230 (diff) | |
| download | vcxsrv-da8fe31a7ba4acf109097d5696ad0145b991cdfd.tar.gz vcxsrv-da8fe31a7ba4acf109097d5696ad0145b991cdfd.tar.bz2 vcxsrv-da8fe31a7ba4acf109097d5696ad0145b991cdfd.zip | |
Changes for VC compilation
Diffstat (limited to 'freetype/include')
57 files changed, 72 insertions, 72 deletions
diff --git a/freetype/include/freetype/ftadvanc.h b/freetype/include/freetype/ftadvanc.h index b2451bec4..8c10b77cb 100644 --- a/freetype/include/freetype/ftadvanc.h +++ b/freetype/include/freetype/ftadvanc.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftbbox.h b/freetype/include/freetype/ftbbox.h index 01fe3fb0d..0347eda01 100644 --- a/freetype/include/freetype/ftbbox.h +++ b/freetype/include/freetype/ftbbox.h @@ -32,7 +32,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftbdf.h b/freetype/include/freetype/ftbdf.h index 4f8baf840..34de541ec 100644 --- a/freetype/include/freetype/ftbdf.h +++ b/freetype/include/freetype/ftbdf.h @@ -20,7 +20,7 @@ #define __FTBDF_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftbitmap.h b/freetype/include/freetype/ftbitmap.h index 92742369b..b314273d8 100644 --- a/freetype/include/freetype/ftbitmap.h +++ b/freetype/include/freetype/ftbitmap.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftcid.h b/freetype/include/freetype/ftcid.h index 203a30caf..5771441cf 100644 --- a/freetype/include/freetype/ftcid.h +++ b/freetype/include/freetype/ftcid.h @@ -19,7 +19,7 @@ #define __FTCID_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftgasp.h b/freetype/include/freetype/ftgasp.h index 91a769e52..9b4cac9f8 100644 --- a/freetype/include/freetype/ftgasp.h +++ b/freetype/include/freetype/ftgasp.h @@ -20,7 +20,7 @@ #define _FT_GASP_H_ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftglyph.h b/freetype/include/freetype/ftglyph.h index cacccf025..23b1bce59 100644 --- a/freetype/include/freetype/ftglyph.h +++ b/freetype/include/freetype/ftglyph.h @@ -34,7 +34,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftgxval.h b/freetype/include/freetype/ftgxval.h index 497015c10..54ab1459c 100644 --- a/freetype/include/freetype/ftgxval.h +++ b/freetype/include/freetype/ftgxval.h @@ -29,7 +29,7 @@ #define __FTGXVAL_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftgzip.h b/freetype/include/freetype/ftgzip.h index acbc4f032..69d03c353 100644 --- a/freetype/include/freetype/ftgzip.h +++ b/freetype/include/freetype/ftgzip.h @@ -20,7 +20,7 @@ #define __FTGZIP_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftincrem.h b/freetype/include/freetype/ftincrem.h index 96abedea7..2cafddfdf 100644 --- a/freetype/include/freetype/ftincrem.h +++ b/freetype/include/freetype/ftincrem.h @@ -20,7 +20,7 @@ #define __FTINCREM_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftlcdfil.h b/freetype/include/freetype/ftlcdfil.h index c6201b38e..b3924ab84 100644 --- a/freetype/include/freetype/ftlcdfil.h +++ b/freetype/include/freetype/ftlcdfil.h @@ -21,7 +21,7 @@ #define __FT_LCD_FILTER_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftlist.h b/freetype/include/freetype/ftlist.h index 93b05fc0d..b268c2a33 100644 --- a/freetype/include/freetype/ftlist.h +++ b/freetype/include/freetype/ftlist.h @@ -29,7 +29,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftlzw.h b/freetype/include/freetype/ftlzw.h index 00d40169a..6446bb0ea 100644 --- a/freetype/include/freetype/ftlzw.h +++ b/freetype/include/freetype/ftlzw.h @@ -20,7 +20,7 @@ #define __FTLZW_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftmodapi.h b/freetype/include/freetype/ftmodapi.h index b051d34a8..5657a893e 100644 --- a/freetype/include/freetype/ftmodapi.h +++ b/freetype/include/freetype/ftmodapi.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftotval.h b/freetype/include/freetype/ftotval.h index 027f2e886..3d6e0ebee 100644 --- a/freetype/include/freetype/ftotval.h +++ b/freetype/include/freetype/ftotval.h @@ -31,7 +31,7 @@ #define __FTOTVAL_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftoutln.h b/freetype/include/freetype/ftoutln.h index d7d01e827..7900aac92 100644 --- a/freetype/include/freetype/ftoutln.h +++ b/freetype/include/freetype/ftoutln.h @@ -22,7 +22,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftpfr.h b/freetype/include/freetype/ftpfr.h index 0b7b7d427..ae98d2520 100644 --- a/freetype/include/freetype/ftpfr.h +++ b/freetype/include/freetype/ftpfr.h @@ -20,7 +20,7 @@ #define __FTPFR_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftsizes.h b/freetype/include/freetype/ftsizes.h index 3e548cc39..bbcc4e0b2 100644 --- a/freetype/include/freetype/ftsizes.h +++ b/freetype/include/freetype/ftsizes.h @@ -30,7 +30,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftsnames.h b/freetype/include/freetype/ftsnames.h index 477e1e3ce..9ceec0a03 100644 --- a/freetype/include/freetype/ftsnames.h +++ b/freetype/include/freetype/ftsnames.h @@ -24,7 +24,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftsynth.h b/freetype/include/freetype/ftsynth.h index a068b7928..f63c76333 100644 --- a/freetype/include/freetype/ftsynth.h +++ b/freetype/include/freetype/ftsynth.h @@ -46,7 +46,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/fttrigon.h b/freetype/include/freetype/fttrigon.h index 6b77d2ee5..f5f94e502 100644 --- a/freetype/include/freetype/fttrigon.h +++ b/freetype/include/freetype/fttrigon.h @@ -19,7 +19,7 @@ #ifndef __FTTRIGON_H__ #define __FTTRIGON_H__ -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftwinfnt.h b/freetype/include/freetype/ftwinfnt.h index ea3335353..ec48702ee 100644 --- a/freetype/include/freetype/ftwinfnt.h +++ b/freetype/include/freetype/ftwinfnt.h @@ -20,7 +20,7 @@ #define __FTWINFNT_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ftxf86.h b/freetype/include/freetype/ftxf86.h index ae9ff076f..f1de58cc5 100644 --- a/freetype/include/freetype/ftxf86.h +++ b/freetype/include/freetype/ftxf86.h @@ -20,7 +20,7 @@ #define __FTXF86_H__ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/internal/autohint.h b/freetype/include/freetype/internal/autohint.h index ee004022f..2bb23cc1b 100644 --- a/freetype/include/freetype/internal/autohint.h +++ b/freetype/include/freetype/internal/autohint.h @@ -71,7 +71,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/ftcalc.h b/freetype/include/freetype/internal/ftcalc.h index 58def34ca..0cebf7eab 100644 --- a/freetype/include/freetype/internal/ftcalc.h +++ b/freetype/include/freetype/internal/ftcalc.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/ftdebug.h b/freetype/include/freetype/internal/ftdebug.h index 7baae3531..f8e19e965 100644 --- a/freetype/include/freetype/internal/ftdebug.h +++ b/freetype/include/freetype/internal/ftdebug.h @@ -27,7 +27,7 @@ #include <ft2build.h> #include FT_CONFIG_CONFIG_H -#include FT_FREETYPE_H +#include <freetype/freetype.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/ftgloadr.h b/freetype/include/freetype/internal/ftgloadr.h index 548481ac8..d6df525d1 100644 --- a/freetype/include/freetype/internal/ftgloadr.h +++ b/freetype/include/freetype/internal/ftgloadr.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/ftobjs.h b/freetype/include/freetype/internal/ftobjs.h index 1f22343a5..9c9a2e85d 100644 --- a/freetype/include/freetype/internal/ftobjs.h +++ b/freetype/include/freetype/internal/ftobjs.h @@ -27,14 +27,14 @@ #define __FTOBJS_H__ #include <ft2build.h> -#include FT_RENDER_H -#include FT_SIZES_H -#include FT_LCD_FILTER_H -#include FT_INTERNAL_MEMORY_H -#include FT_INTERNAL_GLYPH_LOADER_H -#include FT_INTERNAL_DRIVER_H -#include FT_INTERNAL_AUTOHINT_H -#include FT_INTERNAL_SERVICE_H +#include <freetype/ftrender.h> +#include <freetype/ftsizes.h> +#include <freetype/ftlcdfil.h> +#include <freetype/internal/ftmemory.h> +#include <freetype/internal/ftgloadr.h> +#include <freetype/internal/ftdriver.h> +#include <freetype/internal/autohint.h> +#include <freetype/internal/ftserv.h> #ifdef FT_CONFIG_OPTION_INCREMENTAL #include FT_INCREMENTAL_H diff --git a/freetype/include/freetype/internal/ftrfork.h b/freetype/include/freetype/internal/ftrfork.h index aa573c870..6d91e1eb2 100644 --- a/freetype/include/freetype/internal/ftrfork.h +++ b/freetype/include/freetype/internal/ftrfork.h @@ -26,7 +26,7 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/ftstream.h b/freetype/include/freetype/internal/ftstream.h index a91eb72d9..0f93c1e67 100644 --- a/freetype/include/freetype/internal/ftstream.h +++ b/freetype/include/freetype/internal/ftstream.h @@ -22,7 +22,7 @@ #include <ft2build.h> #include FT_SYSTEM_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/pcftypes.h b/freetype/include/freetype/internal/pcftypes.h index 382796ffb..67dae4e8f 100644 --- a/freetype/include/freetype/internal/pcftypes.h +++ b/freetype/include/freetype/internal/pcftypes.h @@ -30,7 +30,7 @@ THE SOFTWARE. #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/psaux.h b/freetype/include/freetype/internal/psaux.h index 7fb4c9916..3d0732981 100644 --- a/freetype/include/freetype/internal/psaux.h +++ b/freetype/include/freetype/internal/psaux.h @@ -22,9 +22,9 @@ #include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_TYPE1_TYPES_H -#include FT_SERVICE_POSTSCRIPT_CMAPS_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/t1types.h> +#include <freetype/internal/services/svpscmap.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/pshints.h b/freetype/include/freetype/internal/pshints.h index 48452c0cf..7502c8036 100644 --- a/freetype/include/freetype/internal/pshints.h +++ b/freetype/include/freetype/internal/pshints.h @@ -23,8 +23,8 @@ #include <ft2build.h> -#include FT_FREETYPE_H -#include FT_TYPE1_TABLES_H +#include <freetype/freetype.h> +#include <freetype/t1tables.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/services/svbdf.h b/freetype/include/freetype/internal/services/svbdf.h index 0f7fc6115..681b23c4b 100644 --- a/freetype/include/freetype/internal/services/svbdf.h +++ b/freetype/include/freetype/internal/services/svbdf.h @@ -20,7 +20,7 @@ #define __SVBDF_H__ #include FT_BDF_H -#include FT_INTERNAL_SERVICE_H +#include <freetype/internal/ftserv.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/services/svcid.h b/freetype/include/freetype/internal/services/svcid.h index 2e391f288..c66041afd 100644 --- a/freetype/include/freetype/internal/services/svcid.h +++ b/freetype/include/freetype/internal/services/svcid.h @@ -18,7 +18,7 @@ #ifndef __SVCID_H__ #define __SVCID_H__ -#include FT_INTERNAL_SERVICE_H +#include <freetype/internal/ftserv.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/services/svgldict.h b/freetype/include/freetype/internal/services/svgldict.h index e5e56b253..66d884a88 100644 --- a/freetype/include/freetype/internal/services/svgldict.h +++ b/freetype/include/freetype/internal/services/svgldict.h @@ -19,7 +19,7 @@ #ifndef __SVGLDICT_H__ #define __SVGLDICT_H__ -#include FT_INTERNAL_SERVICE_H +#include <freetype/internal/ftserv.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/services/svgxval.h b/freetype/include/freetype/internal/services/svgxval.h index 2cdab5065..7707d0751 100644 --- a/freetype/include/freetype/internal/services/svgxval.h +++ b/freetype/include/freetype/internal/services/svgxval.h @@ -29,7 +29,7 @@ #define __SVGXVAL_H__ #include FT_GX_VALIDATE_H -#include FT_INTERNAL_VALIDATE_H +#include <freetype/internal/ftvalid.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/services/svkern.h b/freetype/include/freetype/internal/services/svkern.h index 1488adf49..68f5a96e9 100644 --- a/freetype/include/freetype/internal/services/svkern.h +++ b/freetype/include/freetype/internal/services/svkern.h @@ -19,7 +19,7 @@ #ifndef __SVKERN_H__ #define __SVKERN_H__ -#include FT_INTERNAL_SERVICE_H +#include <freetype/internal/ftserv.h> #include FT_TRUETYPE_TABLES_H diff --git a/freetype/include/freetype/internal/services/svmm.h b/freetype/include/freetype/internal/services/svmm.h index 8a99ec4b1..8ab4e412d 100644 --- a/freetype/include/freetype/internal/services/svmm.h +++ b/freetype/include/freetype/internal/services/svmm.h @@ -19,7 +19,7 @@ #ifndef __SVMM_H__ #define __SVMM_H__ -#include FT_INTERNAL_SERVICE_H +#include <freetype/internal/ftserv.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/services/svotval.h b/freetype/include/freetype/internal/services/svotval.h index 970bbd575..141cddb46 100644 --- a/freetype/include/freetype/internal/services/svotval.h +++ b/freetype/include/freetype/internal/services/svotval.h @@ -20,7 +20,7 @@ #define __SVOTVAL_H__ #include FT_OPENTYPE_VALIDATE_H -#include FT_INTERNAL_VALIDATE_H +#include <freetype/internal/ftvalid.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/services/svpfr.h b/freetype/include/freetype/internal/services/svpfr.h index 462786f9c..65760c8a3 100644 --- a/freetype/include/freetype/internal/services/svpfr.h +++ b/freetype/include/freetype/internal/services/svpfr.h @@ -20,7 +20,7 @@ #define __SVPFR_H__ #include FT_PFR_H -#include FT_INTERNAL_SERVICE_H +#include <freetype/internal/ftserv.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/services/svpostnm.h b/freetype/include/freetype/internal/services/svpostnm.h index 282da68d1..33543bcde 100644 --- a/freetype/include/freetype/internal/services/svpostnm.h +++ b/freetype/include/freetype/internal/services/svpostnm.h @@ -19,7 +19,7 @@ #ifndef __SVPOSTNM_H__ #define __SVPOSTNM_H__ -#include FT_INTERNAL_SERVICE_H +#include <freetype/internal/ftserv.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/services/svpscmap.h b/freetype/include/freetype/internal/services/svpscmap.h index c4e25ed63..1982f2bc3 100644 --- a/freetype/include/freetype/internal/services/svpscmap.h +++ b/freetype/include/freetype/internal/services/svpscmap.h @@ -19,7 +19,7 @@ #ifndef __SVPSCMAP_H__ #define __SVPSCMAP_H__ -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/services/svpsinfo.h b/freetype/include/freetype/internal/services/svpsinfo.h index 124c6f9f9..2cf00dd2c 100644 --- a/freetype/include/freetype/internal/services/svpsinfo.h +++ b/freetype/include/freetype/internal/services/svpsinfo.h @@ -19,8 +19,8 @@ #ifndef __SVPSINFO_H__ #define __SVPSINFO_H__ -#include FT_INTERNAL_SERVICE_H -#include FT_INTERNAL_TYPE1_TYPES_H +#include <freetype/internal/ftserv.h> +#include <freetype/internal/t1types.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/services/svsfnt.h b/freetype/include/freetype/internal/services/svsfnt.h index b4a85d97e..a669dcfbb 100644 --- a/freetype/include/freetype/internal/services/svsfnt.h +++ b/freetype/include/freetype/internal/services/svsfnt.h @@ -19,7 +19,7 @@ #ifndef __SVSFNT_H__ #define __SVSFNT_H__ -#include FT_INTERNAL_SERVICE_H +#include <freetype/internal/ftserv.h> #include FT_TRUETYPE_TABLES_H diff --git a/freetype/include/freetype/internal/services/svttcmap.h b/freetype/include/freetype/internal/services/svttcmap.h index 553ecb074..081d8c235 100644 --- a/freetype/include/freetype/internal/services/svttcmap.h +++ b/freetype/include/freetype/internal/services/svttcmap.h @@ -24,7 +24,7 @@ #ifndef __SVTTCMAP_H__ #define __SVTTCMAP_H__ -#include FT_INTERNAL_SERVICE_H +#include <freetype/internal/ftserv.h> #include FT_TRUETYPE_TABLES_H diff --git a/freetype/include/freetype/internal/services/svtteng.h b/freetype/include/freetype/internal/services/svtteng.h index 58e02a6f9..4612884cb 100644 --- a/freetype/include/freetype/internal/services/svtteng.h +++ b/freetype/include/freetype/internal/services/svtteng.h @@ -19,7 +19,7 @@ #ifndef __SVTTENG_H__ #define __SVTTENG_H__ -#include FT_INTERNAL_SERVICE_H +#include <freetype/internal/ftserv.h> #include FT_MODULE_H diff --git a/freetype/include/freetype/internal/services/svttglyf.h b/freetype/include/freetype/internal/services/svttglyf.h index e57d484b7..18ea65eed 100644 --- a/freetype/include/freetype/internal/services/svttglyf.h +++ b/freetype/include/freetype/internal/services/svttglyf.h @@ -17,7 +17,7 @@ #ifndef __SVTTGLYF_H__ #define __SVTTGLYF_H__ -#include FT_INTERNAL_SERVICE_H +#include <freetype/internal/ftserv.h> #include FT_TRUETYPE_TABLES_H diff --git a/freetype/include/freetype/internal/services/svwinfnt.h b/freetype/include/freetype/internal/services/svwinfnt.h index 57f7765d9..7ae69e2a4 100644 --- a/freetype/include/freetype/internal/services/svwinfnt.h +++ b/freetype/include/freetype/internal/services/svwinfnt.h @@ -19,7 +19,7 @@ #ifndef __SVWINFNT_H__ #define __SVWINFNT_H__ -#include FT_INTERNAL_SERVICE_H +#include <freetype/internal/ftserv.h> #include FT_WINFONTS_H diff --git a/freetype/include/freetype/internal/services/svxf86nm.h b/freetype/include/freetype/internal/services/svxf86nm.h index ca5d884a8..b16cbbf7b 100644 --- a/freetype/include/freetype/internal/services/svxf86nm.h +++ b/freetype/include/freetype/internal/services/svxf86nm.h @@ -19,7 +19,7 @@ #ifndef __SVXF86NM_H__ #define __SVXF86NM_H__ -#include FT_INTERNAL_SERVICE_H +#include <freetype/internal/ftserv.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/sfnt.h b/freetype/include/freetype/internal/sfnt.h index 7e8f6847c..7a1aa3826 100644 --- a/freetype/include/freetype/internal/sfnt.h +++ b/freetype/include/freetype/internal/sfnt.h @@ -21,8 +21,8 @@ #include <ft2build.h> -#include FT_INTERNAL_DRIVER_H -#include FT_INTERNAL_TRUETYPE_TYPES_H +#include <freetype/internal/ftdriver.h> +#include <freetype/internal/tttypes.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/t1types.h b/freetype/include/freetype/internal/t1types.h index ff021b0fe..9accaa57a 100644 --- a/freetype/include/freetype/internal/t1types.h +++ b/freetype/include/freetype/internal/t1types.h @@ -22,10 +22,10 @@ #include <ft2build.h> -#include FT_TYPE1_TABLES_H -#include FT_INTERNAL_POSTSCRIPT_HINTS_H -#include FT_INTERNAL_SERVICE_H -#include FT_SERVICE_POSTSCRIPT_CMAPS_H +#include <freetype/t1tables.h> +#include <freetype/internal/pshints.h> +#include <freetype/internal/ftserv.h> +#include <freetype/internal/services/svpscmap.h> FT_BEGIN_HEADER diff --git a/freetype/include/freetype/internal/tttypes.h b/freetype/include/freetype/internal/tttypes.h index 85fc27f74..d4b3770c6 100644 --- a/freetype/include/freetype/internal/tttypes.h +++ b/freetype/include/freetype/internal/tttypes.h @@ -23,7 +23,7 @@ #include <ft2build.h> #include FT_TRUETYPE_TABLES_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftobjs.h> #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT #include FT_MULTIPLE_MASTERS_H diff --git a/freetype/include/freetype/t1tables.h b/freetype/include/freetype/t1tables.h index 5e2a3934c..507f864d3 100644 --- a/freetype/include/freetype/t1tables.h +++ b/freetype/include/freetype/t1tables.h @@ -22,7 +22,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/tttables.h b/freetype/include/freetype/tttables.h index c12b17268..9876c0367 100644 --- a/freetype/include/freetype/tttables.h +++ b/freetype/include/freetype/tttables.h @@ -22,7 +22,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/tttags.h b/freetype/include/freetype/tttags.h index 307ce4b63..5d86e93fb 100644 --- a/freetype/include/freetype/tttags.h +++ b/freetype/include/freetype/tttags.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" diff --git a/freetype/include/freetype/ttunpat.h b/freetype/include/freetype/ttunpat.h index a0162759b..53e62eab0 100644 --- a/freetype/include/freetype/ttunpat.h +++ b/freetype/include/freetype/ttunpat.h @@ -23,7 +23,7 @@ #include <ft2build.h> -#include FT_FREETYPE_H +#include <freetype/freetype.h> #ifdef FREETYPE_H #error "freetype.h of FreeType 1 has been loaded!" |