From 6370e358b5a32c8866be28e2dd1cc80f2be37e8f Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Wed, 21 Jun 2017 18:14:02 +0100 Subject: Harfbuzz tweaks. Avoid defining any functions/variables beginning with hb_ to avoid potential namespace clashes. Clarify language about why the Harfbuzz workarounds are needed. --- Makethird | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makethird') diff --git a/Makethird b/Makethird index a2de97db..7744072d 100644 --- a/Makethird +++ b/Makethird @@ -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 -- cgit v1.2.3