minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* include/freetype/config/ftconfig.h (FT_EXPORT, FT_EXPORT_DEF) 

[_MSC_VER]: Limit Visual C++ attributes.
This commit is contained in:
Alexei Podtelezhnikov 2018-01-02 21:38:35 -05:00
parent ecfdfd4498
commit c94d042be6
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2018-01-03 Alexei Podtelezhnikov <apodtele@gmail.com>
* include/freetype/config/ftconfig.h (FT_EXPORT, FT_EXPORT_DEF)
[_MSC_VER]: Limit Visual C++ attributes.
2018-01-03 Werner Lemberg <wl@gnu.org>
[truetype] Make blend/design coordinate round-tripping work.

17
include/freetype/config/ftconfig.h
View File

@ -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