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

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>
reviewed by: plam
* configure.in:

View File

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

View File

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