SGI compilation fixes (reported by Christoph Bauer):

1) reorder union definition of _FcChar;
2) omit .stats =.

diff --git a/ChangeLog b/ChangeLog
index 560be03c16ff1d9ed40e845e0a6ffc1444723003..2c857d6a6fb924bfbb3801819a3f2c2988d7b914 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:

diff --git a/fc-lang/fc-lang.c b/fc-lang/fc-lang.c
index 9875363ab39c3c5022a89b14231b8bbd27287f20..3451c6e48832a2c4967421820c7c45efa4e07ab3 100644 (file)
--- a/fc-lang/fc-lang.c
+++ b/fc-lang/fc-lang.c
@@ -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);
     }

diff --git a/src/fcint.h b/src/fcint.h
index 92e048eb15ab3636ad3cb806c521c01ea0bc100b..61a051731da8574954ba8610d660116d263f1811 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -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;
 };