rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Werner Lemberg 2020-06-13 21:15:45 +02:00
parent e13391333f
commit 1658685967
267 changed files with 9 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2020-06-13 Werner Lemberg <wl@gnu.org>
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'.
2020-06-08 David Turner <david@freetype.org>
Make macros for header file names optional.

1
builds/mac/ftmac.c
View File

@ -62,7 +62,6 @@
*/
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/tttags.h>
#include <freetype/internal/ftstream.h>

1
builds/wince/ftdebug.c
View File

@ -41,7 +41,6 @@
*/
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/internal/ftdebug.h>

1
builds/windows/ftdebug.c
View File

@ -41,7 +41,6 @@
*/
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/internal/ftdebug.h>

5
include/freetype/freetype.h
View File

@ -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>

1
include/freetype/ftadvanc.h
View File

@ -20,7 +20,6 @@
#define FTADVANC_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftbbox.h
View File

@ -31,7 +31,6 @@
#define FTBBOX_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftbdf.h
View File

@ -19,7 +19,6 @@
#ifndef FTBDF_H_
#define FTBDF_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftbitmap.h
View File

@ -20,7 +20,6 @@
#define FTBITMAP_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/ftcolor.h>

1
include/freetype/ftbzip2.h
View File

@ -19,7 +19,6 @@
#ifndef FTBZIP2_H_
#define FTBZIP2_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftcache.h
View File

@ -20,7 +20,6 @@
#define FTCACHE_H_
#include <ft2build.h>
#include <freetype/ftglyph.h>

1
include/freetype/ftcid.h
View File

@ -19,7 +19,6 @@
#ifndef FTCID_H_
#define FTCID_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftcolor.h
View File

@ -19,7 +19,6 @@
#ifndef FTCOLOR_H_
#define FTCOLOR_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftdriver.h
View File

@ -19,7 +19,6 @@
#ifndef FTDRIVER_H_
#define FTDRIVER_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/ftparams.h>

1
include/freetype/ftfntfmt.h
View File

@ -19,7 +19,6 @@
#ifndef FTFNTFMT_H_
#define FTFNTFMT_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftgasp.h
View File

@ -19,7 +19,6 @@
#ifndef FTGASP_H_
#define FTGASP_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftglyph.h
View File

@ -33,7 +33,6 @@
#define FTGLYPH_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftgxval.h
View File

@ -28,7 +28,6 @@
#ifndef FTGXVAL_H_
#define FTGXVAL_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftgzip.h
View File

@ -19,7 +19,6 @@
#ifndef FTGZIP_H_
#define FTGZIP_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftimage.h
View File

@ -30,7 +30,6 @@
/* STANDALONE_ is from ftgrays.c */
#ifndef STANDALONE_
#include <ft2build.h>
#endif

1
include/freetype/ftincrem.h
View File

@ -19,7 +19,6 @@
#ifndef FTINCREM_H_
#define FTINCREM_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/ftparams.h>

1
include/freetype/ftlcdfil.h
View File

@ -20,7 +20,6 @@
#ifndef FTLCDFIL_H_
#define FTLCDFIL_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/ftparams.h>

1
include/freetype/ftlist.h
View File

@ -28,7 +28,6 @@
#define FTLIST_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftlzw.h
View File

@ -19,7 +19,6 @@
#ifndef FTLZW_H_
#define FTLZW_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftmac.h
View File

@ -29,7 +29,6 @@
#define FTMAC_H_
#include <ft2build.h>
FT_BEGIN_HEADER

1
include/freetype/ftmm.h
View File

@ -20,7 +20,6 @@
#define FTMM_H_
#include <ft2build.h>
#include <freetype/t1tables.h>

1
include/freetype/ftmodapi.h
View File

@ -20,7 +20,6 @@
#define FTMODAPI_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftotval.h
View File

@ -30,7 +30,6 @@
#ifndef FTOTVAL_H_
#define FTOTVAL_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftoutln.h
View File

@ -21,7 +21,6 @@
#define FTOUTLN_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftparams.h
View File

@ -19,7 +19,6 @@
#ifndef FTPARAMS_H_
#define FTPARAMS_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftpfr.h
View File

@ -19,7 +19,6 @@
#ifndef FTPFR_H_
#define FTPFR_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftrender.h
View File

@ -20,7 +20,6 @@
#define FTRENDER_H_
#include <ft2build.h>
#include <freetype/ftmodapi.h>
#include <freetype/ftglyph.h>

1
include/freetype/ftsizes.h
View File

@ -29,7 +29,6 @@
#define FTSIZES_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftsnames.h
View File

@ -23,7 +23,6 @@
#define FTSNAMES_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/ftparams.h>

1
include/freetype/ftstroke.h
View File

@ -19,7 +19,6 @@
#ifndef FTSTROKE_H_
#define FTSTROKE_H_
#include <ft2build.h>
#include <freetype/ftoutln.h>
#include <freetype/ftglyph.h>

1
include/freetype/ftsynth.h
View File

@ -45,7 +45,6 @@
#define FTSYNTH_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ftsystem.h
View File

@ -20,7 +20,6 @@
#define FTSYSTEM_H_
#include <ft2build.h>
FT_BEGIN_HEADER

1
include/freetype/ftwinfnt.h
View File

@ -19,7 +19,6 @@
#ifndef FTWINFNT_H_
#define FTWINFNT_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/internal/autohint.h
View File

@ -70,7 +70,6 @@
*/
#include <ft2build.h>
#include <freetype/freetype.h>

1
include/freetype/internal/cffotypes.h
View File

@ -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>

1
include/freetype/internal/cfftypes.h
View File

@ -21,7 +21,6 @@
#define CFFTYPES_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/t1tables.h>
#include <freetype/internal/ftserv.h>

1
include/freetype/internal/ftcalc.h
View File

@ -20,7 +20,6 @@
#define FTCALC_H_
#include <ft2build.h>
#include <freetype/freetype.h>

1
include/freetype/internal/ftdrv.h
View File

@ -20,7 +20,6 @@
#define FTDRV_H_
#include <ft2build.h>
#include <freetype/ftmodapi.h>

1
include/freetype/internal/ftgloadr.h
View File

@ -20,7 +20,6 @@
#define FTGLOADR_H_
#include <ft2build.h>
#include <freetype/freetype.h>

1
include/freetype/internal/fthash.h
View File

@ -43,7 +43,6 @@
#define FTHASH_H_
#include <ft2build.h>
#include <freetype/freetype.h>

1
include/freetype/internal/ftobjs.h
View File

@ -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>

1
include/freetype/internal/ftpsprop.h
View File

@ -20,7 +20,6 @@
#define FTPSPROP_H_
#include <ft2build.h>
#include <freetype/freetype.h>

1
include/freetype/internal/ftrfork.h
View File

@ -25,7 +25,6 @@
#define FTRFORK_H_
#include <ft2build.h>
#include <freetype/internal/ftobjs.h>

1
include/freetype/internal/psaux.h
View File

@ -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>

1
include/freetype/internal/pshints.h
View File

@ -22,7 +22,6 @@
#define PSHINTS_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/t1tables.h>

1
include/freetype/internal/sfnt.h
View File

@ -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>

1
include/freetype/internal/t1types.h
View File

@ -21,7 +21,6 @@
#define T1TYPES_H_
#include <ft2build.h>
#include <freetype/t1tables.h>
#include <freetype/internal/pshints.h>
#include <freetype/internal/ftserv.h>

1
include/freetype/internal/tttypes.h
View File

@ -21,7 +21,6 @@
#define TTTYPES_H_
#include <ft2build.h>
#include <freetype/tttables.h>
#include <freetype/internal/ftobjs.h>
#include <freetype/ftcolor.h>

1
include/freetype/internal/wofftypes.h
View File

@ -21,7 +21,6 @@
#define WOFFTYPES_H_
#include <ft2build.h>
#include <freetype/tttables.h>
#include <freetype/internal/ftobjs.h>

1
include/freetype/t1tables.h
View File

@ -21,7 +21,6 @@
#define T1TABLES_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/ttnameid.h
View File

@ -20,7 +20,6 @@
#define TTNAMEID_H_
#include <ft2build.h>
FT_BEGIN_HEADER

1
include/freetype/tttables.h
View File

@ -21,7 +21,6 @@
#define TTTABLES_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
include/freetype/tttags.h
View File

@ -20,7 +20,6 @@
#define TTAGS_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#ifdef FREETYPE_H

1
src/autofit/afcjk.c
View File

@ -22,7 +22,6 @@
*
*/
#include <ft2build.h>
#include <freetype/ftadvanc.h>
#include <freetype/internal/ftdebug.h>

1
src/autofit/aflatin.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/ftadvanc.h>
#include <freetype/internal/ftdebug.h>

1
src/autofit/aflatin2.c
View File

@ -21,7 +21,6 @@
*/
#include <ft2build.h>
#include <freetype/ftadvanc.h>

1
src/autofit/afmodule.h
View File

@ -19,7 +19,6 @@
#ifndef AFMODULE_H_
#define AFMODULE_H_
#include <ft2build.h>
#include <freetype/internal/ftobjs.h>
#include <freetype/ftmodapi.h>

1
src/autofit/afshaper.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/ftadvanc.h>
#include "afglobal.h"

1
src/autofit/afshaper.h
View File

@ -20,7 +20,6 @@
#define AFSHAPER_H_
#include <ft2build.h>
#include <freetype/freetype.h>

1
src/autofit/aftypes.h
View File

@ -32,7 +32,6 @@
#ifndef AFTYPES_H_
#define AFTYPES_H_
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/ftoutln.h>

1
src/autofit/autofit.c
View File

@ -17,7 +17,6 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "afangles.c"
#include "afblue.c"

1
src/base/ftadvanc.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/ftadvanc.h>

1
src/base/ftbase.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include "ftadvanc.c"

1
src/base/ftbase.h
View File

@ -20,7 +20,6 @@
#define FTBASE_H_
#include <ft2build.h>
#include <freetype/internal/ftobjs.h>

1
src/base/ftbbox.c
View File

@ -24,7 +24,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/ftbbox.h>

1
src/base/ftbdf.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/ftobjs.h>

1
src/base/ftbitmap.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/ftbitmap.h>

1
src/base/ftcalc.c
View File

@ -32,7 +32,6 @@
*/
#include <ft2build.h>
#include <freetype/ftglyph.h>
#include <freetype/fttrigon.h>
#include <freetype/internal/ftcalc.h>

1
src/base/ftcid.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/ftcid.h>
#include <freetype/internal/ftobjs.h>
#include <freetype/internal/services/svcid.h>

1
src/base/ftcolor.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/sfnt.h>
#include <freetype/internal/tttypes.h>

1
src/base/ftdebug.c
View File

@ -41,7 +41,6 @@
*/
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/internal/ftdebug.h>

1
src/base/fterrors.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/fterrors.h>

1
src/base/ftfntfmt.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/ftfntfmt.h>
#include <freetype/internal/ftobjs.h>
#include <freetype/internal/services/svfntfmt.h>

1
src/base/ftfstype.c
View File

@ -15,7 +15,6 @@
*
*/
#include <ft2build.h>
#include <freetype/t1tables.h>
#include <freetype/tttables.h>
#include <freetype/internal/ftserv.h>

1
src/base/ftgasp.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/ftgasp.h>
#include <freetype/internal/tttypes.h>

1
src/base/ftgloadr.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/ftgloadr.h>
#include <freetype/internal/ftmemory.h>

1
src/base/ftglyph.c
View File

@ -28,7 +28,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/ftglyph.h>

1
src/base/ftgxval.c
View File

@ -25,7 +25,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/ftobjs.h>

1
src/base/fthash.c
View File

@ -39,7 +39,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/fthash.h>
#include <freetype/internal/ftmemory.h>

1
src/base/ftlcdfil.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/ftlcdfil.h>

1
src/base/ftmac.c
View File

@ -65,7 +65,6 @@
*/
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/tttags.h>
#include <freetype/internal/ftstream.h>

1
src/base/ftmm.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/ftmm.h>

1
src/base/ftobjs.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/ftlist.h>
#include <freetype/ftoutln.h>
#include <freetype/ftfntfmt.h>

1
src/base/ftotval.c
View File

@ -15,7 +15,6 @@
*
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/ftobjs.h>

1
src/base/ftoutln.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/ftoutln.h>
#include <freetype/internal/ftobjs.h>
#include <freetype/internal/ftcalc.h>

1
src/base/ftpatent.c
View File

@ -16,7 +16,6 @@
*
*/
#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/tttags.h>
#include <freetype/internal/ftobjs.h>

1
src/base/ftpfr.c
View File

@ -15,7 +15,6 @@
*
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/ftobjs.h>

1
src/base/ftpsprop.c
View File

@ -17,7 +17,6 @@
*/
#include <ft2build.h>
#include <freetype/ftdriver.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/psaux.h>

1
src/base/ftrfork.c
View File

@ -24,7 +24,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/ftstream.h>
#include <freetype/internal/ftrfork.h>

1
src/base/ftsnames.c
View File

@ -19,7 +19,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/ftsnames.h>

1
src/base/ftstream.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftstream.h>
#include <freetype/internal/ftdebug.h>

1
src/base/ftstroke.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/ftstroke.h>
#include <freetype/fttrigon.h>
#include <freetype/ftoutln.h>

1
src/base/ftsynth.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/ftsynth.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/ftobjs.h>

1
src/base/fttrigon.c
View File

@ -29,7 +29,6 @@
*
*/
#include <ft2build.h>
#include <freetype/internal/ftobjs.h>
#include <freetype/internal/ftcalc.h>
#include <freetype/fttrigon.h>

1
src/base/fttype1.c
View File

@ -16,7 +16,6 @@
*/
#include <ft2build.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/ftobjs.h>
#include <freetype/internal/ftserv.h>

Some files were not shown because too many files have changed in this diff Show More