[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 3273521 2/2: Fix static compilation with Visual C.
From: |
Werner LEMBERG |
Subject: |
[freetype2] master 3273521 2/2: Fix static compilation with Visual C. |
Date: |
Tue, 28 Jul 2020 12:35:33 -0400 (EDT) |
branch: master
commit 3273521f408938e0088258bda62d280d6e5967eb
Author: Anuj Verma <anujv@iitbhilai.ac.in>
Commit: Werner Lemberg <wl@gnu.org>
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 899d54c..18313c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 f86a84f..8ed3d11 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 3273521 2/2: Fix static compilation with Visual C.,
Werner LEMBERG <=