diff options
| author | David Turner <david@freetype.org> | 2020-07-06 10:56:36 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2020-07-06 11:49:00 +0200 |
| commit | cb4a943bc4d24d48eeb5d1515c5acd880c4a82ab (patch) | |
| tree | f6ae4a420193b36f3d0eb32df216a7d8783d66c4 /src/sfnt | |
| parent | 2eb8f8862669f50bf11693fb5c4f729a0ddf847f (diff) | |
| download | freetype2-cb4a943bc4d24d48eeb5d1515c5acd880c4a82ab.tar.gz | |
[build] Fix multi and C++ builds.
The following builds were failing due to previous changes:
make multi
make multi CC="c++"
* include/freetype/config/ftconfig.h: Remove `FT_END_HEADER'.
* include/freetype/config/ftheader.h (FT_BEGIN_HEADER,
FT_END_HEADER): Protect against redefinition.
* src/cache/ftccache.h, src/cache/ftcmru.h, src/pcf/pcfutil.h,
src/psaux/pserror.h, src/psaux/psft.h, src/psaux/psstack.h,
src/sfnt/woff2tags.h: Include `compiler-macros.h'.
* src/sfnt/woff2tags.c: Include `woff2tags.h'.
Diffstat (limited to 'src/sfnt')
| -rw-r--r-- | src/sfnt/woff2tags.c | 2 | ||||
| -rw-r--r-- | src/sfnt/woff2tags.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/sfnt/woff2tags.c b/src/sfnt/woff2tags.c index 977538519..fd9f2e6c5 100644 --- a/src/sfnt/woff2tags.c +++ b/src/sfnt/woff2tags.c @@ -17,7 +17,7 @@ #include <freetype/tttags.h> - +#include "woff2tags.h" /* * Return tag from index in the order given in WOFF2 specification. diff --git a/src/sfnt/woff2tags.h b/src/sfnt/woff2tags.h index d0d28ae0a..c437c77aa 100644 --- a/src/sfnt/woff2tags.h +++ b/src/sfnt/woff2tags.h @@ -21,6 +21,7 @@ #include <freetype/internal/ftobjs.h> +#include <freetype/internal/compiler-macros.h> FT_BEGIN_HEADER |