Skip to content

Commit cce1244

Browse files
nulanohugovk
authored andcommitted
hide FriBiDi shim symbols to avoid conflict with real FriBiDi library
1 parent 64edb9c commit cce1244

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/thirdparty/fribidi-shim/fribidi.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
/* FriBiDi>=1.0.0 adds bracket_types param, ignore and call legacy function */
15-
FriBidiLevel fribidi_get_par_embedding_levels_ex_compat(
15+
static FriBidiLevel fribidi_get_par_embedding_levels_ex_compat(
1616
const FriBidiCharType *bidi_types,
1717
const FriBidiBracketType *bracket_types,
1818
const FriBidiStrIndex len,
@@ -24,7 +24,7 @@ FriBidiLevel fribidi_get_par_embedding_levels_ex_compat(
2424
}
2525

2626
/* FriBiDi>=1.0.0 gets bracket types here, ignore */
27-
void fribidi_get_bracket_types_compat(
27+
static void fribidi_get_bracket_types_compat(
2828
const FriBidiChar *str,
2929
const FriBidiStrIndex len,
3030
const FriBidiCharType *types,

src/thirdparty/fribidi-shim/fribidi.h

+4
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,12 @@ typedef uint32_t FriBidiParType;
6363
/* functions */
6464

6565
#ifdef FRIBIDI_SHIM_IMPLEMENTATION
66+
#ifdef _MSC_VER
6667
#define FRIBIDI_ENTRY
6768
#else
69+
#define FRIBIDI_ENTRY __attribute__((visibility ("hidden")))
70+
#endif
71+
#else
6872
#define FRIBIDI_ENTRY extern
6973
#endif
7074

0 commit comments

Comments
 (0)