Merge pull request #5651 from nulano/5637

Hide FriBiDi shim symbols to avoid conflict with real FriBiDi library
python-pillow · Sep 1, 2021 · 874118e · 874118e
2 parents 5ef6290 + 259c671
commit 874118e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/thirdparty/fribidi-shim/fribidi.c b/src/thirdparty/fribidi-shim/fribidi.c
@@ -12,7 +12,7 @@
 
 
 /* FriBiDi>=1.0.0 adds bracket_types param, ignore and call legacy function */
-FriBidiLevel fribidi_get_par_embedding_levels_ex_compat(
+static FriBidiLevel fribidi_get_par_embedding_levels_ex_compat(
     const FriBidiCharType *bidi_types,
     const FriBidiBracketType *bracket_types,
     const FriBidiStrIndex len,
@@ -24,7 +24,7 @@ FriBidiLevel fribidi_get_par_embedding_levels_ex_compat(
 }
 
 /* FriBiDi>=1.0.0 gets bracket types here, ignore */
-void fribidi_get_bracket_types_compat(
+static void fribidi_get_bracket_types_compat(
     const FriBidiChar *str,
     const FriBidiStrIndex len,
     const FriBidiCharType *types,

diff --git a/src/thirdparty/fribidi-shim/fribidi.h b/src/thirdparty/fribidi-shim/fribidi.h
@@ -63,8 +63,12 @@ typedef uint32_t FriBidiParType;
 /* functions */
 
 #ifdef FRIBIDI_SHIM_IMPLEMENTATION
+#ifdef _MSC_VER
 #define FRIBIDI_ENTRY
 #else
+#define FRIBIDI_ENTRY __attribute__((visibility ("hidden")))
+#endif
+#else
 #define FRIBIDI_ENTRY extern
 #endif