X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffcinit.c;h=7d2311fae2bdb5fc9112f2ea772c5d731f52ec0d;hb=23816bf9acbd6cc5dd942daaba3cc084ea70d99d;hp=9ce795273fd0e4fb00fe52182ea9fdb3abee3090;hpb=f045376c0831f068e8fd8fd61773a5ed83dede7f;p=fontconfig.git diff --git a/src/fcinit.c b/src/fcinit.c index 9ce7952..7d2311f 100644 --- a/src/fcinit.c +++ b/src/fcinit.c @@ -35,6 +35,8 @@ FcInitFallbackConfig (void) goto bail0; if (!FcConfigAddDir (config, (FcChar8 *) FC_DEFAULT_FONTS)) goto bail1; + if (!FcConfigAddCacheDir (config, (FcChar8 *) FC_CACHEDIR)) + goto bail1; return config; bail1: @@ -119,7 +121,7 @@ FcFini (void) FcConfigDestroy (_fcConfig); FcPatternFini (); - FcCharSetThawAll (); + FcCacheFini (); } /* @@ -208,9 +210,6 @@ static int FcMemNotice = 1*1024*1024; static int FcAllocNotify, FcFreeNotify; -void -FcValueListReport (void); - void FcMemReport (void) { @@ -233,7 +232,6 @@ FcMemReport (void) FcAllocMem - FcFreeMem); FcAllocNotify = 0; FcFreeNotify = 0; - FcValueListReport (); } void @@ -265,3 +263,6 @@ FcMemFree (int kind, int size) FcMemReport (); } } +#define __fcinit__ +#include "fcaliastail.h" +#undef __fcinit__