diff options
author | Werner Lemberg <wl@gnu.org> | 2017-03-17 07:52:30 +0100 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2017-03-17 07:52:30 +0100 |
commit | bffb7fe90b1a3403ee253c30974beaa8ee436567 (patch) | |
tree | bebb763968101c00b8bc749b9fc3e218d3a6fef1 /src/cff/cffobjs.c | |
parent | fdbef538f41198a59af8bebfc2841e3ce25b10d1 (diff) | |
download | freetype2-bffb7fe90b1a3403ee253c30974beaa8ee436567.tar.gz |
`make multi' fixes; compiler warnings.
* src/base/ftsnames.c: Include FT_INTERNAL_DEBUG_H.
* src/cff/cffobjs.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
FT_MULTIPLE_MASTERS_H and FT_SERVICE_MULTIPLE_MASTERS_H.
* src/sfnt/sfdriver.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
FT_MULTIPLE_MASTERS_H and FT_SERVICE_MULTIPLE_MASTERS_H.
(get_win_string, get_apple_string): Initialize `result'.
Diffstat (limited to 'src/cff/cffobjs.c')
-rw-r--r-- | src/cff/cffobjs.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index 832276143..ddcfdc97d 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -27,6 +27,11 @@ #include FT_INTERNAL_SFNT_H #include FT_CFF_DRIVER_H +#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT +#include FT_MULTIPLE_MASTERS_H +#include FT_SERVICE_MULTIPLE_MASTERS_H +#endif + #include "cffobjs.h" #include "cffload.h" #include "cffcmap.h" |