walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Regenerate x86 line in fcarch.tmpl.h to match change in cache data. 

Also remove spurious printf of directory names.
This commit is contained in:
Keith Packard 2006-08-28 09:43:12 -07:00
parent 0d9e31c810
commit 7db39f7298
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fc-arch/Makefile.am
View File

@ -43,7 +43,7 @@ noinst_MANS=fc-arch.man
EXTRA_DIST=$(TMPL) EXTRA_DIST=$(TMPL)
$(TARG):fc-arch${EXEEXT} $(STMPL) $(TARG):fc-arch${EXEEXT} $(STMPL) ${top_srcdir}/src/fcint.h ../config.h
rm -f $(TARG) rm -f $(TARG)
./fc-arch${EXEEXT} $(ARCHITECTURE) < $(STMPL) > $(TARG) ./fc-arch${EXEEXT} $(ARCHITECTURE) < $(STMPL) > $(TARG)

2
fc-arch/fcarch.tmpl.h
View File

@ -29,4 +29,4 @@
@@@ use something reasonable and don't include any spaces @@@ use something reasonable and don't include any spaces
@@@ @@@
@@@ name endian char char* int Pattern EltPtr Elt * Elt ObjPtr VLPtr Value Binding VL * CharSet Leaf** Char16 * Char16 Leaf Char32 Cache PageSize @@@ name endian char char* int Pattern EltPtr Elt * Elt ObjPtr VLPtr Value Binding VL * CharSet Leaf** Char16 * Char16 Leaf Char32 Cache PageSize
x86 78563412_00000001_00000004_00000004_00000018_00000008_00000004_0000000c_00000004_00000008_0000000c_00000004_00000004_00000014_00000004_00000004_00000002_00000020_00000004_00000030_00001000 x86 78563412_00000001_00000004_00000004_00000018_00000008_00000004_0000000c_00000004_00000008_0000000c_00000004_00000004_00000014_00000004_00000004_00000002_00000020_00000004_00000038_00001000

1
src/fcdir.c
View File

@ -143,7 +143,6 @@ FcDirScanConfig (FcFontSet *set,
canon_dir = FcStrCanonFilename (dir); canon_dir = FcStrCanonFilename (dir);
if (!canon_dir) canon_dir = (FcChar8 *) dir; if (!canon_dir) canon_dir = (FcChar8 *) dir;
printf ("dir %s canon %s\n", dir, canon_dir);
if (config && !FcConfigAcceptFilename (config, canon_dir)) { if (config && !FcConfigAcceptFilename (config, canon_dir)) {
ret = FcTrue; ret = FcTrue;