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/psaux | |
| 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/psaux')
| -rw-r--r-- | src/psaux/pserror.h | 1 | ||||
| -rw-r--r-- | src/psaux/psft.h | 2 | ||||
| -rw-r--r-- | src/psaux/psstack.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/psaux/pserror.h b/src/psaux/pserror.h index eb0a865e2..5738853fa 100644 --- a/src/psaux/pserror.h +++ b/src/psaux/pserror.h @@ -50,6 +50,7 @@ #include <freetype/fterrors.h> +#include <freetype/internal/compiler-macros.h> #include "psft.h" diff --git a/src/psaux/psft.h b/src/psaux/psft.h index 902983ed7..3da454e60 100644 --- a/src/psaux/psft.h +++ b/src/psaux/psft.h @@ -40,9 +40,9 @@ #define PSFT_H_ +#include <freetype/internal/compiler-macros.h> #include "pstypes.h" - /* TODO: disable asserts for now */ #define CF2_NDEBUG diff --git a/src/psaux/psstack.h b/src/psaux/psstack.h index 18cd39bc6..b9ef9edf1 100644 --- a/src/psaux/psstack.h +++ b/src/psaux/psstack.h @@ -39,6 +39,7 @@ #ifndef PSSTACK_H_ #define PSSTACK_H_ +#include <freetype/internal/compiler-macros.h> FT_BEGIN_HEADER |