freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 79c8bd911: [gzip] Fix static linking.


From: Werner Lemberg
Subject: [freetype2] master 79c8bd911: [gzip] Fix static linking.
Date: Wed, 1 Mar 2023 12:12:30 -0500 (EST)

branch: master
commit 79c8bd91100af8d1b8df82269815a95ca1e91ead
Author: ubawurinna <you@example.com>
Commit: Werner Lemberg <wl@gnu.org>

    [gzip] Fix static linking.
    
    Without this patch, static linking with MS Visual Studio causes linking
    errors.
    
    * src/gzip/ftgzip.c: Set `ZEXPORT` to nothing and `ZEXTERN` to static for
    all compilers.
---
 src/gzip/ftgzip.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gzip/ftgzip.c b/src/gzip/ftgzip.c
index 48da6ff9c..ca6a2aabe 100644
--- a/src/gzip/ftgzip.c
+++ b/src/gzip/ftgzip.c
@@ -70,10 +70,9 @@
   /* so that configuration with `FT_CONFIG_OPTION_SYSTEM_ZLIB' might   */
   /* include the wrong `zconf.h' file, leading to errors.              */
 
-#if defined( __GNUC__ ) ||  defined( __clang__ )
 #define ZEXPORT
-#define ZEXTERN      static
-#endif
+  /* prevent zlib functions from being visible outside their object files */
+#define ZEXTERN  static
 
 #define HAVE_MEMCPY  1
 #define Z_SOLO       1



reply via email to

[Prev in Thread] Current Thread [Next in Thread]