1*4882a593SmuzhiyunFrom 41ef9a0bc36b9db7115fbe9623f989bfb47bbade Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Chris Liddell <chris.liddell@artifex.com> 3*4882a593SmuzhiyunDate: Tue, 20 Oct 2020 09:49:45 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Bug 702985: drop use of FT_CALLBACK_DEF() def 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFrom 2.10.3, Freetype disappeared the FT_CALLBACK_DEF() macro, which is what 7*4882a593Smuzhiyunwe used when defining our callbacks from Freetype. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunNo guidance forthcoming from the Freetype developer who made those changes, 10*4882a593Smuzhiyunso change to explicitly declaring the callbacks file static. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunShould fix the reported build failures. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunDownloaded from upstream commit: 15*4882a593Smuzhiyunhttps://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=41ef9a0bc36b 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunSigned-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 18*4882a593Smuzhiyun--- 19*4882a593Smuzhiyun base/fapi_ft.c | 6 +++--- 20*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 3 deletions(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/base/fapi_ft.c b/base/fapi_ft.c 23*4882a593Smuzhiyunindex 65fa6dcf4..21aef2f06 100644 24*4882a593Smuzhiyun--- a/base/fapi_ft.c 25*4882a593Smuzhiyun+++ b/base/fapi_ft.c 26*4882a593Smuzhiyun@@ -125,7 +125,7 @@ static void 27*4882a593Smuzhiyun delete_inc_int_info(gs_fapi_server * a_server, 28*4882a593Smuzhiyun FT_IncrementalRec * a_inc_int_info); 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun-FT_CALLBACK_DEF(void *) 31*4882a593Smuzhiyun+static void * 32*4882a593Smuzhiyun FF_alloc(FT_Memory memory, long size) 33*4882a593Smuzhiyun { 34*4882a593Smuzhiyun gs_memory_t *mem = (gs_memory_t *) memory->user; 35*4882a593Smuzhiyun@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size) 36*4882a593Smuzhiyun return (gs_malloc(mem, size, 1, "FF_alloc")); 37*4882a593Smuzhiyun } 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun-FT_CALLBACK_DEF(void *) 40*4882a593Smuzhiyun+static void * 41*4882a593Smuzhiyun FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block) 42*4882a593Smuzhiyun { 43*4882a593Smuzhiyun gs_memory_t *mem = (gs_memory_t *) memory->user; 44*4882a593Smuzhiyun@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *) 45*4882a593Smuzhiyun return (tmp); 46*4882a593Smuzhiyun } 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun-FT_CALLBACK_DEF(void) 49*4882a593Smuzhiyun+static void 50*4882a593Smuzhiyun FF_free(FT_Memory memory, void *block) 51*4882a593Smuzhiyun { 52*4882a593Smuzhiyun gs_memory_t *mem = (gs_memory_t *) memory->user; 53*4882a593Smuzhiyun-- 54*4882a593Smuzhiyun2.17.1 55*4882a593Smuzhiyun 56