diff options
| author | Anuj Verma <anujv@iitbhilai.ac.in> | 2020-07-28 18:34:37 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2020-07-28 18:34:37 +0200 |
| commit | 3273521f408938e0088258bda62d280d6e5967eb (patch) | |
| tree | e88fb59e09bc2ee70def3311530c9d3e8661b3c8 | |
| parent | fffc303a7f397d08eee719eca351bdb55b3a1e83 (diff) | |
| download | freetype2-3273521f408938e0088258bda62d280d6e5967eb.tar.gz | |
Fix static compilation with Visual C.
* include/freetype/internal/compiler-macros.h
(FT_INTERNAL_FUNCTION_ATTRIBUTE) <_WIN32>: Define as empty.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | include/freetype/internal/compiler-macros.h | 9 |
2 files changed, 15 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2020-07-28 Anuj Verma <anujv@iitbhilai.ac.in> + + Fix static compilation with Visual C. + + * include/freetype/internal/compiler-macros.h + (FT_INTERNAL_FUNCTION_ATTRIBUTE) <_WIN32>: Define as empty. + 2020-07-28 Priyesh Kumar <priyeshkkumar@gmail.com> Fix `-Wformat' compiler warnings. diff --git a/include/freetype/internal/compiler-macros.h b/include/freetype/internal/compiler-macros.h index f86a84f52..8ed3d1178 100644 --- a/include/freetype/internal/compiler-macros.h +++ b/include/freetype/internal/compiler-macros.h @@ -105,9 +105,16 @@ FT_BEGIN_HEADER * generate smaller and faster code on ELF-based platforms. Place this * before a function declaration. */ -#if ( defined( __GNUC__ ) && __GNUC__ >= 4 ) || defined( __clang__ ) + + /* Visual C, mingw */ +#if defined( _WIN32 ) +#define FT_INTERNAL_FUNCTION_ATTRIBUTE /* empty */ + + /* gcc, clang */ +#elif ( defined( __GNUC__ ) && __GNUC__ >= 4 ) || defined( __clang__ ) #define FT_INTERNAL_FUNCTION_ATTRIBUTE \ __attribute__(( visibility( "hidden" ) )) + #else #define FT_INTERNAL_FUNCTION_ATTRIBUTE /* empty */ #endif |