diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2022-05-17 16:53:17 +0100 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2022-06-01 09:28:13 +0100 |
| commit | 64bffc6bdff1d5048442659d7b1bcca9b0f715ec (patch) | |
| tree | c50b4b98c02e857ff5603dd6aca82f4b31783293 /freetype | |
| parent | b7e6921869f9826f596ac1298b62671cf0381f6e (diff) | |
| download | ghostpdl-64bffc6bdff1d5048442659d7b1bcca9b0f715ec.tar.gz | |
Make FT_EXPORT and FT_EXPORT_DEF definitions conditional
This is required so we can use our own definitions, and hide the Freetype
symbols inside our .so build.
Diffstat (limited to 'freetype')
| -rw-r--r-- | freetype/include/freetype/config/public-macros.h | 3 | ||||
| -rw-r--r-- | freetype/include/freetype/internal/compiler-macros.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/freetype/include/freetype/config/public-macros.h b/freetype/include/freetype/config/public-macros.h index 0074134f1..273972d18 100644 --- a/freetype/include/freetype/config/public-macros.h +++ b/freetype/include/freetype/config/public-macros.h @@ -101,8 +101,9 @@ FT_BEGIN_HEADER * functions are exported with C linkage, even when the header is included * by a C++ source file. */ +#ifndef FT_EXPORT #define FT_EXPORT( x ) FT_PUBLIC_FUNCTION_ATTRIBUTE extern x - +#endif /* * `FT_UNUSED` indicates that a given parameter is not used -- this is diff --git a/freetype/include/freetype/internal/compiler-macros.h b/freetype/include/freetype/internal/compiler-macros.h index 66fa13c3c..4c3b2ffe5 100644 --- a/freetype/include/freetype/internal/compiler-macros.h +++ b/freetype/include/freetype/internal/compiler-macros.h @@ -259,7 +259,9 @@ FT_BEGIN_HEADER */ /* See `freetype/config/compiler_macros.h` for the `FT_EXPORT` definition */ +#ifndef FT_EXPORT_DEF #define FT_EXPORT_DEF( x ) FT_FUNCTION_DEFINITION( x ) +#endif /* * The following macros are needed to compile the library with a |