diff options
author | David Turner <david@freetype.org> | 2020-07-06 10:56:36 +0200 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2020-07-07 06:51:09 +0200 |
commit | 0f35b042e02e23cc6fb29d805d25aa85679274eb (patch) | |
tree | ea1b31ac8e1428e0267096ab465bf817d3bd1976 /src | |
parent | cb4a943bc4d24d48eeb5d1515c5acd880c4a82ab (diff) | |
download | freetype2-0f35b042e02e23cc6fb29d805d25aa85679274eb.tar.gz |
[build] Really fix multi and C++ builds.
The following builds were still failing due to previous changes:
make multi
make multi CC="c++"
make CC="c++"
This patch fixes the issues, which were missing includes to get the
right macro definitions in multi-build mode.
Also, `FT_UNUSED' is actually used by third-party code, so move it
back to `public-macros.h' to avoid breaking it.
* include/freetype/config/public-macros.h (FT_EXPORT): Remove
special definition for C++.
(FT_UNUSED): Define here instead of...
* include/freetype/config/compiler-macros.h: ... here.
(FT_FUNCTION_DECLARATION): Remove special definition for C++.
(FT_LOCAL_ARRAY_DEF): Fix definition.
* src/cache/ftccback.h, src/lzw/ftzopen.h, src/gxvalid/gxvmort.h,
src/gxvalid/gxvmorx.h: Add `FT_BEGIN_HEADER' and `FT_END_HEADER'.
Diffstat (limited to 'src')
-rw-r--r-- | src/cache/ftccback.h | 2 | ||||
-rw-r--r-- | src/gxvalid/gxvmort.h | 5 | ||||
-rw-r--r-- | src/gxvalid/gxvmorx.h | 5 | ||||
-rw-r--r-- | src/lzw/ftzopen.h | 3 |
4 files changed, 15 insertions, 0 deletions
diff --git a/src/cache/ftccback.h b/src/cache/ftccback.h index 802fd4444..542acb156 100644 --- a/src/cache/ftccback.h +++ b/src/cache/ftccback.h @@ -25,6 +25,7 @@ #include "ftcglyph.h" #include "ftcsbits.h" +FT_BEGIN_HEADER FT_LOCAL( void ) ftc_inode_free( FTC_Node inode, @@ -84,6 +85,7 @@ ftc_node_destroy( FTC_Node node, FTC_Manager manager ); +FT_END_HEADER #endif /* FTCCBACK_H_ */ diff --git a/src/gxvalid/gxvmort.h b/src/gxvalid/gxvmort.h index 24c7e45b2..7237c5825 100644 --- a/src/gxvalid/gxvmort.h +++ b/src/gxvalid/gxvmort.h @@ -34,6 +34,9 @@ #include <freetype/ftsnames.h> +FT_BEGIN_HEADER + + typedef struct GXV_mort_featureRec_ { FT_UShort featureType; @@ -88,6 +91,8 @@ GXV_Validator gxvalid ); +FT_END_HEADER + #endif /* GXVMORT_H_ */ diff --git a/src/gxvalid/gxvmorx.h b/src/gxvalid/gxvmorx.h index ceb14a9e8..f747b1d63 100644 --- a/src/gxvalid/gxvmorx.h +++ b/src/gxvalid/gxvmorx.h @@ -36,6 +36,9 @@ #include <freetype/ftsnames.h> +FT_BEGIN_HEADER + + FT_LOCAL( void ) gxv_morx_subtable_type0_validate( FT_Bytes table, FT_Bytes limit, @@ -62,6 +65,8 @@ GXV_Validator gxvalid ); +FT_END_HEADER + #endif /* GXVMORX_H_ */ diff --git a/src/lzw/ftzopen.h b/src/lzw/ftzopen.h index cb9206b3e..d8768f7b4 100644 --- a/src/lzw/ftzopen.h +++ b/src/lzw/ftzopen.h @@ -24,6 +24,7 @@ #include <freetype/freetype.h> +FT_BEGIN_HEADER /* * This is a complete re-implementation of the LZW file reader, @@ -165,6 +166,8 @@ /* */ +FT_END_HEADER + #endif /* FTZOPEN_H_ */ |