From c94d042be61ce3a1cdcf281c473e674a76b117ba Mon Sep 17 00:00:00 2001 From: Alexei Podtelezhnikov Date: Tue, 2 Jan 2018 21:38:35 -0500 Subject: [PATCH] * include/freetype/config/ftconfig.h (FT_EXPORT, FT_EXPORT_DEF) [_MSC_VER]: Limit Visual C++ attributes. --- ChangeLog | 5 +++++ include/freetype/config/ftconfig.h | 17 +++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d6fce78c..1a49bdd0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-01-03 Alexei Podtelezhnikov + + * include/freetype/config/ftconfig.h (FT_EXPORT, FT_EXPORT_DEF) + [_MSC_VER]: Limit Visual C++ attributes. + 2018-01-03 Werner Lemberg [truetype] Make blend/design coordinate round-tripping work. diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h index 86dc44509..f539e9a17 100644 --- a/include/freetype/config/ftconfig.h +++ b/include/freetype/config/ftconfig.h @@ -455,22 +455,27 @@ FT_BEGIN_HEADER /* */ #ifndef FT_EXPORT -#if defined( _DLL ) -#define FT_EXPORT( x ) __declspec( dllexport ) x -#elif defined( __cplusplus ) +#ifdef __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 +#define FT_EXPORT( x ) __declspec( dllimport ) x +#endif +#endif + #endif /* !FT_EXPORT */ #ifndef FT_EXPORT_DEF -#if defined( _DLL ) -#define FT_EXPORT_DEF( x ) __declspec( dllexport ) x -#elif defined( __cplusplus ) +#ifdef __cplusplus #define FT_EXPORT_DEF( x ) extern "C" x #else #define FT_EXPORT_DEF( x ) extern x