diff options
author | Werner Lemberg <wl@gnu.org> | 2017-03-18 07:06:49 +0100 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2017-03-18 07:06:49 +0100 |
commit | 9931175dcc57313be60d3633f7597ec4db446a35 (patch) | |
tree | 998187908fa4534fd72429c81e5190094d43c424 /src/type1 | |
parent | d5bfa053f5854cc42966634e1b26a8024b7a51d4 (diff) | |
download | freetype2-9931175dcc57313be60d3633f7597ec4db446a35.tar.gz |
Improve `make multi'.
* src/autofit/aflatin2.c: Guard file with FT_OPTION_AUTOFIT2.
* src/base/ftmac.c: Guard more parts of the file with FT_MACINTOSH.
* src/psaux/afmparse.c: Guard file with T1_CONFIG_OPTION_NO_AFM.
* src/sfnt/pngshim.c: Guard file with
TT_CONFIG_OPTION_EMBEDDED_BITMAPS also.
* src/sfnt/ttbdf.c: Avoid empty source file.
* src/sfnt/ttpost.c: Guard file with
TT_CONFIG_OPTION_POSTSCRIPT_NAMES.
* src/sfnt/ttsbit.c: Guard file with
TT_CONFIG_OPTION_EMBEDDED_BITMAPS.
* src/truetype/ttgxvar.c, src/truetype/ttinterp.c: Avoid empty
source file.
* src/truetype/ttsubpix.c: Guard file with
TT_USE_BYTECODE_INTERPRETER also.
* src/type1/t1afm.c: Guard file with T1_CONFIG_OPTION_NO_AFM.
* src/autofit/autofit.c, src/base/ftbase.c, src/cache/ftcache.c,
src/cff/cff.c, src/cid/type1cid.c, src/gxvalid/gxvalid.c,
src/pcf/pcf.c, src/pfr/pfr.c, src/psaux/psaux.c,
src/pshinter/pshinter.c, src/psnames/psnames.c, src/raster/raster.c,
src/sfnt/sfnt.c, src/smooth/smooth.c, src/truetype/truetype.c,
src/type1/type1.c, src/type42/type42.c: Remove conditionals; sort
entries.
Diffstat (limited to 'src/type1')
-rw-r--r-- | src/type1/t1afm.c | 9 | ||||
-rw-r--r-- | src/type1/type1.c | 13 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c index 792ea2ff9..11a2646fc 100644 --- a/src/type1/t1afm.c +++ b/src/type1/t1afm.c @@ -24,6 +24,8 @@ #include "t1errors.h" +#ifndef T1_CONFIG_OPTION_NO_AFM + /*************************************************************************/ /* */ /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ @@ -402,5 +404,12 @@ return FT_Err_Ok; } +#else /* T1_CONFIG_OPTION_NO_AFM */ + + /* ANSI C doesn't like empty source files */ + typedef int _t1_afm_dummy; + +#endif /* T1_CONFIG_OPTION_NO_AFM */ + /* END */ diff --git a/src/type1/type1.c b/src/type1/type1.c index bfe0e439f..81795376e 100644 --- a/src/type1/type1.c +++ b/src/type1/type1.c @@ -17,17 +17,14 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT - #include <ft2build.h> -#include "t1parse.c" -#include "t1load.c" -#include "t1objs.c" -#include "t1driver.c" -#include "t1gload.c" -#ifndef T1_CONFIG_OPTION_NO_AFM #include "t1afm.c" -#endif +#include "t1driver.c" +#include "t1gload.c" +#include "t1load.c" +#include "t1objs.c" +#include "t1parse.c" /* END */ |