From 3273521f408938e0088258bda62d280d6e5967eb Mon Sep 17 00:00:00 2001 From: Anuj Verma Date: Tue, 28 Jul 2020 18:34:37 +0200 Subject: Fix static compilation with Visual C. * include/freetype/internal/compiler-macros.h (FT_INTERNAL_FUNCTION_ATTRIBUTE) <_WIN32>: Define as empty. --- ChangeLog | 7 +++++++ include/freetype/internal/compiler-macros.h | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 899d54c0e..18313c1e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2020-07-28 Anuj Verma + + 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 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 -- cgit v1.2.1