diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2018-05-04 03:48:43 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2018-05-04 03:48:43 +0000 |
commit | 90faf12dc7ac78559d3bb81953320d776a835e4b (patch) | |
tree | 63f5984f95b88d6b61bb33f35f15291027b5b2b0 /Build/source/libs/freetype2/freetype-src/include/freetype/config | |
parent | 0544c09782621c9e10d568d81d543db34e07af83 (diff) |
freetype-2.9.1
git-svn-id: svn://tug.org/texlive/trunk@47607 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/include/freetype/config')
-rw-r--r-- | Build/source/libs/freetype2/freetype-src/include/freetype/config/ftconfig.h | 25 | ||||
-rw-r--r-- | Build/source/libs/freetype2/freetype-src/include/freetype/config/ftoption.h | 4 |
2 files changed, 21 insertions, 8 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftconfig.h b/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftconfig.h index f539e9a17a7..eedebf4082e 100644 --- a/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftconfig.h +++ b/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftconfig.h @@ -422,9 +422,9 @@ FT_BEGIN_HEADER #endif /* !FT_BASE_DEF */ - /* When compiling FreeType as a DLL, some systems/compilers need a */ - /* special attribute in front OR after the return type of function */ - /* declarations. */ + /* When compiling FreeType as a DLL or DSO with hidden visibility */ + /* some systems/compilers need a special attribute in front OR after */ + /* the return type of function declarations. */ /* */ /* Two macros are used within the FreeType source code to define */ /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */ @@ -455,19 +455,28 @@ FT_BEGIN_HEADER /* */ #ifndef FT_EXPORT -#ifdef __cplusplus +#ifdef FT2_BUILD_LIBRARY + +#if defined( _WIN32 ) && ( defined( _DLL ) || defined( DLL_EXPORT ) ) +#define FT_EXPORT( x ) __declspec( dllexport ) x +#elif defined( __GNUC__ ) && __GNUC__ >= 4 +#define FT_EXPORT( x ) __attribute__(( visibility( "default" ) )) x +#elif defined( __cplusplus ) #define FT_EXPORT( x ) extern "C" x #else #define FT_EXPORT( x ) extern x #endif -#ifdef _MSC_VER -#undef FT_EXPORT -#ifdef _DLL -#define FT_EXPORT( x ) __declspec( dllexport ) x #else + +#if defined( FT2_DLLIMPORT ) #define FT_EXPORT( x ) __declspec( dllimport ) x +#elif defined( __cplusplus ) +#define FT_EXPORT( x ) extern "C" x +#else +#define FT_EXPORT( x ) extern x #endif + #endif #endif /* !FT_EXPORT */ diff --git a/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftoption.h b/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftoption.h index a5cb7fff235..4bcab2af5c8 100644 --- a/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftoption.h +++ b/Build/source/libs/freetype2/freetype-src/include/freetype/config/ftoption.h @@ -82,6 +82,10 @@ FT_BEGIN_HEADER /* to control the various font drivers and modules. The controllable */ /* properties are listed in the section @properties. */ /* */ + /* You have to undefine this configuration option on platforms that lack */ + /* the concept of environment variables (and thus don't have the */ + /* `getenv' function), for example Windows CE. */ + /* */ /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */ /* multiple lines for better readability). */ /* */ |