From: Patrick Lam <plam@MIT.EDU>
Date: Fri, 7 Apr 2006 17:37:09 +0000 (+0000)
Subject: SGI compilation fixes (reported by Christoph Bauer):
X-Git-Tag: fc-2_3_95~25
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f23f5f388d93655af972083513ba4d505ec4f449;p=fontconfig.git

SGI compilation fixes (reported by Christoph Bauer):
1) reorder union definition of _FcChar;
2) omit .stats =.
---

diff --git a/ChangeLog b/ChangeLog
index 560be03..2c857d6 100644
--- 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 9875363..3451c6e 100644
--- 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 92e048e..61a0517 100644
--- 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;
 };