diff options
| author | Werner Lemberg <wl@gnu.org> | 2020-06-13 21:15:45 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2020-06-13 21:15:45 +0200 |
| commit | 165868596783af1d296aa4fa30295b22cf7e79a2 (patch) | |
| tree | 6ab46a0ceefffa54452f56b3b8fcfb348fc636e2 /include | |
| parent | e13391333f501967db8823025ce8c63259b5d57e (diff) | |
| download | freetype2-165868596783af1d296aa4fa30295b22cf7e79a2.tar.gz | |
Remove redundant inclusion of `ft2build.h'.
* */*: Remove `#include <ft2build.h>' where possible.
* include/freetype/freetype.h: Remove cpp error about missing
inclusion of `ft2build.h'.
Diffstat (limited to 'include')
54 files changed, 0 insertions, 58 deletions
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 93cc9ab55..39662784d 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -20,11 +20,6 @@ #define FREETYPE_H_ -#ifndef FT_FREETYPE_H -#error "`ft2build.h' hasn't been included yet!" -#endif - - #include <ft2build.h> #include FT_CONFIG_CONFIG_H #include <freetype/fttypes.h> diff --git a/include/freetype/ftadvanc.h b/include/freetype/ftadvanc.h index 8a43bdd42..5050d3ac5 100644 --- a/include/freetype/ftadvanc.h +++ b/include/freetype/ftadvanc.h @@ -20,7 +20,6 @@ #define FTADVANC_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftbbox.h b/include/freetype/ftbbox.h index 2adb7326c..fda1ad94a 100644 --- a/include/freetype/ftbbox.h +++ b/include/freetype/ftbbox.h @@ -31,7 +31,6 @@ #define FTBBOX_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftbdf.h b/include/freetype/ftbdf.h index 47323253d..2e1daeeaa 100644 --- a/include/freetype/ftbdf.h +++ b/include/freetype/ftbdf.h @@ -19,7 +19,6 @@ #ifndef FTBDF_H_ #define FTBDF_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftbitmap.h b/include/freetype/ftbitmap.h index 8d43fd4ed..282c22e1c 100644 --- a/include/freetype/ftbitmap.h +++ b/include/freetype/ftbitmap.h @@ -20,7 +20,6 @@ #define FTBITMAP_H_ -#include <ft2build.h> #include <freetype/freetype.h> #include <freetype/ftcolor.h> diff --git a/include/freetype/ftbzip2.h b/include/freetype/ftbzip2.h index a1411eff8..fe582ead8 100644 --- a/include/freetype/ftbzip2.h +++ b/include/freetype/ftbzip2.h @@ -19,7 +19,6 @@ #ifndef FTBZIP2_H_ #define FTBZIP2_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h index 26f48fe5c..604727520 100644 --- a/include/freetype/ftcache.h +++ b/include/freetype/ftcache.h @@ -20,7 +20,6 @@ #define FTCACHE_H_ -#include <ft2build.h> #include <freetype/ftglyph.h> diff --git a/include/freetype/ftcid.h b/include/freetype/ftcid.h index ab002deff..a29fb3330 100644 --- a/include/freetype/ftcid.h +++ b/include/freetype/ftcid.h @@ -19,7 +19,6 @@ #ifndef FTCID_H_ #define FTCID_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftcolor.h b/include/freetype/ftcolor.h index 44bcb8a48..ecc6485e5 100644 --- a/include/freetype/ftcolor.h +++ b/include/freetype/ftcolor.h @@ -19,7 +19,6 @@ #ifndef FTCOLOR_H_ #define FTCOLOR_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftdriver.h b/include/freetype/ftdriver.h index f7ec6f339..34fcaad8d 100644 --- a/include/freetype/ftdriver.h +++ b/include/freetype/ftdriver.h @@ -19,7 +19,6 @@ #ifndef FTDRIVER_H_ #define FTDRIVER_H_ -#include <ft2build.h> #include <freetype/freetype.h> #include <freetype/ftparams.h> diff --git a/include/freetype/ftfntfmt.h b/include/freetype/ftfntfmt.h index 5e235f3dd..f803349cd 100644 --- a/include/freetype/ftfntfmt.h +++ b/include/freetype/ftfntfmt.h @@ -19,7 +19,6 @@ #ifndef FTFNTFMT_H_ #define FTFNTFMT_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftgasp.h b/include/freetype/ftgasp.h index 74eb9048c..6b76882c7 100644 --- a/include/freetype/ftgasp.h +++ b/include/freetype/ftgasp.h @@ -19,7 +19,6 @@ #ifndef FTGASP_H_ #define FTGASP_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h index 88e63fbde..704619e3d 100644 --- a/include/freetype/ftglyph.h +++ b/include/freetype/ftglyph.h @@ -33,7 +33,6 @@ #define FTGLYPH_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftgxval.h b/include/freetype/ftgxval.h index e617b81e3..354460a9a 100644 --- a/include/freetype/ftgxval.h +++ b/include/freetype/ftgxval.h @@ -28,7 +28,6 @@ #ifndef FTGXVAL_H_ #define FTGXVAL_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftgzip.h b/include/freetype/ftgzip.h index 6148b3cf3..2aa8d75d7 100644 --- a/include/freetype/ftgzip.h +++ b/include/freetype/ftgzip.h @@ -19,7 +19,6 @@ #ifndef FTGZIP_H_ #define FTGZIP_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h index 185967c1b..9fecd1fbc 100644 --- a/include/freetype/ftimage.h +++ b/include/freetype/ftimage.h @@ -30,7 +30,6 @@ /* STANDALONE_ is from ftgrays.c */ #ifndef STANDALONE_ -#include <ft2build.h> #endif diff --git a/include/freetype/ftincrem.h b/include/freetype/ftincrem.h index b1b31670e..f67655eda 100644 --- a/include/freetype/ftincrem.h +++ b/include/freetype/ftincrem.h @@ -19,7 +19,6 @@ #ifndef FTINCREM_H_ #define FTINCREM_H_ -#include <ft2build.h> #include <freetype/freetype.h> #include <freetype/ftparams.h> diff --git a/include/freetype/ftlcdfil.h b/include/freetype/ftlcdfil.h index 31cbbe299..b8c5c0036 100644 --- a/include/freetype/ftlcdfil.h +++ b/include/freetype/ftlcdfil.h @@ -20,7 +20,6 @@ #ifndef FTLCDFIL_H_ #define FTLCDFIL_H_ -#include <ft2build.h> #include <freetype/freetype.h> #include <freetype/ftparams.h> diff --git a/include/freetype/ftlist.h b/include/freetype/ftlist.h index f6ce25fef..458892270 100644 --- a/include/freetype/ftlist.h +++ b/include/freetype/ftlist.h @@ -28,7 +28,6 @@ #define FTLIST_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftlzw.h b/include/freetype/ftlzw.h index aec431cd2..904e19b2f 100644 --- a/include/freetype/ftlzw.h +++ b/include/freetype/ftlzw.h @@ -19,7 +19,6 @@ #ifndef FTLZW_H_ #define FTLZW_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftmac.h b/include/freetype/ftmac.h index c1a0aa373..c9de98184 100644 --- a/include/freetype/ftmac.h +++ b/include/freetype/ftmac.h @@ -29,7 +29,6 @@ #define FTMAC_H_ -#include <ft2build.h> FT_BEGIN_HEADER diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h index 7392fe4a8..d8781a829 100644 --- a/include/freetype/ftmm.h +++ b/include/freetype/ftmm.h @@ -20,7 +20,6 @@ #define FTMM_H_ -#include <ft2build.h> #include <freetype/t1tables.h> diff --git a/include/freetype/ftmodapi.h b/include/freetype/ftmodapi.h index 09c3a231d..4b5cdfbaf 100644 --- a/include/freetype/ftmodapi.h +++ b/include/freetype/ftmodapi.h @@ -20,7 +20,6 @@ #define FTMODAPI_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftotval.h b/include/freetype/ftotval.h index e9127124b..9c00ad30b 100644 --- a/include/freetype/ftotval.h +++ b/include/freetype/ftotval.h @@ -30,7 +30,6 @@ #ifndef FTOTVAL_H_ #define FTOTVAL_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h index 5039ee4e6..5069d187b 100644 --- a/include/freetype/ftoutln.h +++ b/include/freetype/ftoutln.h @@ -21,7 +21,6 @@ #define FTOUTLN_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftparams.h b/include/freetype/ftparams.h index 9b893a18b..55ea2a387 100644 --- a/include/freetype/ftparams.h +++ b/include/freetype/ftparams.h @@ -19,7 +19,6 @@ #ifndef FTPARAMS_H_ #define FTPARAMS_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftpfr.h b/include/freetype/ftpfr.h index bd7f0aa2d..9a5383f91 100644 --- a/include/freetype/ftpfr.h +++ b/include/freetype/ftpfr.h @@ -19,7 +19,6 @@ #ifndef FTPFR_H_ #define FTPFR_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftrender.h b/include/freetype/ftrender.h index c33763ca5..8007951b3 100644 --- a/include/freetype/ftrender.h +++ b/include/freetype/ftrender.h @@ -20,7 +20,6 @@ #define FTRENDER_H_ -#include <ft2build.h> #include <freetype/ftmodapi.h> #include <freetype/ftglyph.h> diff --git a/include/freetype/ftsizes.h b/include/freetype/ftsizes.h index a99904212..a8682a30f 100644 --- a/include/freetype/ftsizes.h +++ b/include/freetype/ftsizes.h @@ -29,7 +29,6 @@ #define FTSIZES_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftsnames.h b/include/freetype/ftsnames.h index 46b4dfd5f..729e6ab06 100644 --- a/include/freetype/ftsnames.h +++ b/include/freetype/ftsnames.h @@ -23,7 +23,6 @@ #define FTSNAMES_H_ -#include <ft2build.h> #include <freetype/freetype.h> #include <freetype/ftparams.h> diff --git a/include/freetype/ftstroke.h b/include/freetype/ftstroke.h index 18aee4224..1c5477c5a 100644 --- a/include/freetype/ftstroke.h +++ b/include/freetype/ftstroke.h @@ -19,7 +19,6 @@ #ifndef FTSTROKE_H_ #define FTSTROKE_H_ -#include <ft2build.h> #include <freetype/ftoutln.h> #include <freetype/ftglyph.h> diff --git a/include/freetype/ftsynth.h b/include/freetype/ftsynth.h index 55b1a39b0..bdb4c5753 100644 --- a/include/freetype/ftsynth.h +++ b/include/freetype/ftsynth.h @@ -45,7 +45,6 @@ #define FTSYNTH_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ftsystem.h b/include/freetype/ftsystem.h index f7fecb53f..22aead714 100644 --- a/include/freetype/ftsystem.h +++ b/include/freetype/ftsystem.h @@ -20,7 +20,6 @@ #define FTSYSTEM_H_ -#include <ft2build.h> FT_BEGIN_HEADER diff --git a/include/freetype/ftwinfnt.h b/include/freetype/ftwinfnt.h index 18341dcf7..786528c6e 100644 --- a/include/freetype/ftwinfnt.h +++ b/include/freetype/ftwinfnt.h @@ -19,7 +19,6 @@ #ifndef FTWINFNT_H_ #define FTWINFNT_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/internal/autohint.h b/include/freetype/internal/autohint.h index f344ff183..d4220a274 100644 --- a/include/freetype/internal/autohint.h +++ b/include/freetype/internal/autohint.h @@ -70,7 +70,6 @@ */ -#include <ft2build.h> #include <freetype/freetype.h> diff --git a/include/freetype/internal/cffotypes.h b/include/freetype/internal/cffotypes.h index 360af5332..a316fd1f3 100644 --- a/include/freetype/internal/cffotypes.h +++ b/include/freetype/internal/cffotypes.h @@ -19,7 +19,6 @@ #ifndef CFFOTYPES_H_ #define CFFOTYPES_H_ -#include <ft2build.h> #include <freetype/internal/ftobjs.h> #include <freetype/internal/cfftypes.h> #include <freetype/internal/tttypes.h> diff --git a/include/freetype/internal/cfftypes.h b/include/freetype/internal/cfftypes.h index e48ff1bf9..f21167b1e 100644 --- a/include/freetype/internal/cfftypes.h +++ b/include/freetype/internal/cfftypes.h @@ -21,7 +21,6 @@ #define CFFTYPES_H_ -#include <ft2build.h> #include <freetype/freetype.h> #include <freetype/t1tables.h> #include <freetype/internal/ftserv.h> diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h index d8236d24b..6bc2791f7 100644 --- a/include/freetype/internal/ftcalc.h +++ b/include/freetype/internal/ftcalc.h @@ -20,7 +20,6 @@ #define FTCALC_H_ -#include <ft2build.h> #include <freetype/freetype.h> diff --git a/include/freetype/internal/ftdrv.h b/include/freetype/internal/ftdrv.h index 36caa4f3d..a2945164d 100644 --- a/include/freetype/internal/ftdrv.h +++ b/include/freetype/internal/ftdrv.h @@ -20,7 +20,6 @@ #define FTDRV_H_ -#include <ft2build.h> #include <freetype/ftmodapi.h> diff --git a/include/freetype/internal/ftgloadr.h b/include/freetype/internal/ftgloadr.h index f27dd2b83..27b8659f7 100644 --- a/include/freetype/internal/ftgloadr.h +++ b/include/freetype/internal/ftgloadr.h @@ -20,7 +20,6 @@ #define FTGLOADR_H_ -#include <ft2build.h> #include <freetype/freetype.h> diff --git a/include/freetype/internal/fthash.h b/include/freetype/internal/fthash.h index 5833bc9be..622ec76bb 100644 --- a/include/freetype/internal/fthash.h +++ b/include/freetype/internal/fthash.h @@ -43,7 +43,6 @@ #define FTHASH_H_ -#include <ft2build.h> #include <freetype/freetype.h> diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h index 7c667c13f..c7ac1a76a 100644 --- a/include/freetype/internal/ftobjs.h +++ b/include/freetype/internal/ftobjs.h @@ -26,7 +26,6 @@ #ifndef FTOBJS_H_ #define FTOBJS_H_ -#include <ft2build.h> #include <freetype/ftrender.h> #include <freetype/ftsizes.h> #include <freetype/ftlcdfil.h> diff --git a/include/freetype/internal/ftpsprop.h b/include/freetype/internal/ftpsprop.h index d52ca2c3b..81ec29151 100644 --- a/include/freetype/internal/ftpsprop.h +++ b/include/freetype/internal/ftpsprop.h @@ -20,7 +20,6 @@ #define FTPSPROP_H_ -#include <ft2build.h> #include <freetype/freetype.h> diff --git a/include/freetype/internal/ftrfork.h b/include/freetype/internal/ftrfork.h index 071743f20..1b7b25acb 100644 --- a/include/freetype/internal/ftrfork.h +++ b/include/freetype/internal/ftrfork.h @@ -25,7 +25,6 @@ #define FTRFORK_H_ -#include <ft2build.h> #include <freetype/internal/ftobjs.h> diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h index a917b0ac4..8e0a262fd 100644 --- a/include/freetype/internal/psaux.h +++ b/include/freetype/internal/psaux.h @@ -21,7 +21,6 @@ #define PSAUX_H_ -#include <ft2build.h> #include <freetype/internal/ftobjs.h> #include <freetype/internal/t1types.h> #include <freetype/internal/fthash.h> diff --git a/include/freetype/internal/pshints.h b/include/freetype/internal/pshints.h index 43bd79b67..663e9d348 100644 --- a/include/freetype/internal/pshints.h +++ b/include/freetype/internal/pshints.h @@ -22,7 +22,6 @@ #define PSHINTS_H_ -#include <ft2build.h> #include <freetype/freetype.h> #include <freetype/t1tables.h> diff --git a/include/freetype/internal/sfnt.h b/include/freetype/internal/sfnt.h index 283f0cb82..b4c12dbb2 100644 --- a/include/freetype/internal/sfnt.h +++ b/include/freetype/internal/sfnt.h @@ -20,7 +20,6 @@ #define SFNT_H_ -#include <ft2build.h> #include <freetype/internal/ftdrv.h> #include <freetype/internal/tttypes.h> #include <freetype/internal/wofftypes.h> diff --git a/include/freetype/internal/t1types.h b/include/freetype/internal/t1types.h index 9fe12dbae..6a0fe5e97 100644 --- a/include/freetype/internal/t1types.h +++ b/include/freetype/internal/t1types.h @@ -21,7 +21,6 @@ #define T1TYPES_H_ -#include <ft2build.h> #include <freetype/t1tables.h> #include <freetype/internal/pshints.h> #include <freetype/internal/ftserv.h> diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h index 4a41485cc..c36342c93 100644 --- a/include/freetype/internal/tttypes.h +++ b/include/freetype/internal/tttypes.h @@ -21,7 +21,6 @@ #define TTTYPES_H_ -#include <ft2build.h> #include <freetype/tttables.h> #include <freetype/internal/ftobjs.h> #include <freetype/ftcolor.h> diff --git a/include/freetype/internal/wofftypes.h b/include/freetype/internal/wofftypes.h index a10fef930..1874a138a 100644 --- a/include/freetype/internal/wofftypes.h +++ b/include/freetype/internal/wofftypes.h @@ -21,7 +21,6 @@ #define WOFFTYPES_H_ -#include <ft2build.h> #include <freetype/tttables.h> #include <freetype/internal/ftobjs.h> diff --git a/include/freetype/t1tables.h b/include/freetype/t1tables.h index ed285fc13..426e14024 100644 --- a/include/freetype/t1tables.h +++ b/include/freetype/t1tables.h @@ -21,7 +21,6 @@ #define T1TABLES_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/ttnameid.h b/include/freetype/ttnameid.h index 9a00913ee..2b2ed4c61 100644 --- a/include/freetype/ttnameid.h +++ b/include/freetype/ttnameid.h @@ -20,7 +20,6 @@ #define TTNAMEID_H_ -#include <ft2build.h> FT_BEGIN_HEADER diff --git a/include/freetype/tttables.h b/include/freetype/tttables.h index 8cfd1d2d6..c8fa35ef8 100644 --- a/include/freetype/tttables.h +++ b/include/freetype/tttables.h @@ -21,7 +21,6 @@ #define TTTABLES_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H diff --git a/include/freetype/tttags.h b/include/freetype/tttags.h index 8ed6dbfa1..3c9fbd59d 100644 --- a/include/freetype/tttags.h +++ b/include/freetype/tttags.h @@ -20,7 +20,6 @@ #define TTAGS_H_ -#include <ft2build.h> #include <freetype/freetype.h> #ifdef FREETYPE_H |