diff options
| author | Robin Watts <robin.watts@artifex.com> | 2017-06-21 18:14:02 +0100 |
|---|---|---|
| committer | Robin Watts <Robin.Watts@artifex.com> | 2017-06-29 16:36:01 +0100 |
| commit | 6370e358b5a32c8866be28e2dd1cc80f2be37e8f (patch) | |
| tree | 5de55b26c6f42370679aa3136f64c5f6e0b0963e /Makethird | |
| parent | 460709048cdaa40fd97c59969fee1cecbebd9767 (diff) | |
| download | mupdf-6370e358b5a32c8866be28e2dd1cc80f2be37e8f.tar.xz | |
Harfbuzz tweaks.
Avoid defining any functions/variables beginning with hb_ to avoid
potential namespace clashes.
Clarify language about why the Harfbuzz workarounds are needed.
Diffstat (limited to 'Makethird')
| -rw-r--r-- | Makethird | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -165,8 +165,8 @@ $(HARFBUZZ_OUT): $(MKDIR_CMD) $(HARFBUZZ_OUT)/%.o: $(HARFBUZZ_DIR)/src/%.cc | $(HARFBUZZ_OUT) $(CC_CMD) -DHAVE_OT -DHAVE_UCDN -DHB_NO_MT $(FREETYPE_CFLAGS) \ - -Dhb_malloc_impl=hb_malloc -Dhb_calloc_impl=hb_calloc \ - -Dhb_free_impl=hb_free -Dhb_realloc_impl=hb_realloc \ + -Dhb_malloc_impl=fz_hb_malloc -Dhb_calloc_impl=fz_hb_calloc \ + -Dhb_free_impl=fz_hb_free -Dhb_realloc_impl=fz_hb_realloc \ -fno-rtti -fno-exceptions -fvisibility-inlines-hidden --std=c++0x HARFBUZZ_CFLAGS := -I$(HARFBUZZ_DIR)/src |