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

SGI compilation fixes (reported by Christoph Bauer): 

1) reorder union definition of _FcChar;
2) omit .stats =.
This commit is contained in:
Patrick Lam 2006-04-07 17:37:09 +00:00
parent 44415a079a
commit f23f5f388d
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-04-07 Patrick Lam <plam@mit.edu>
* src/fcint.h:
* fc-lang/fc-lang.c (main):
SGI compilation fixes (reported by Christoph Bauer):
1) reorder union definition of _FcChar;
2) omit .stats =.
2006-04-07 Dominic Lachowicz <cinamod@hotmail.com> 2006-04-07 Dominic Lachowicz <cinamod@hotmail.com>
reviewed by: plam reviewed by: plam
* configure.in: * configure.in:

2
fc-lang/fc-lang.c
View File

@ -449,7 +449,7 @@ main (int argc, char **argv)
printf (" { (FcChar8 *) \"%s\",\n" printf (" { (FcChar8 *) \"%s\",\n"
" { FC_REF_CONSTANT, %d, FC_BANK_LANGS, " " { FC_REF_CONSTANT, %d, FC_BANK_LANGS, "
"{ .stat = { %d, %d } } } }, /* %d */\n", "{ { %d, %d } } } }, /* %d */\n",
langs[i], langs[i],
sets[j]->num, offsets[j], offsets[j], j); sets[j]->num, offsets[j], offsets[j], j);
} }

8
src/fcint.h
View File

@ -226,14 +226,14 @@ struct _FcCharSet {
int num; /* size of leaves and numbers arrays */ int num; /* size of leaves and numbers arrays */
int bank; int bank;
union { union {
struct {
FcCharLeaf **leaves;
FcChar16 *numbers;
} dyn;
struct { struct {
int leafidx_offset; int leafidx_offset;
int numbers_offset; int numbers_offset;
} stat; } stat;
struct {
FcCharLeaf **leaves;
FcChar16 *numbers;
} dyn;
} u; } u;
}; };