pango r2738 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Wed Nov 19 19:52:30 2008
New Revision: 2738
URL: http://svn.gnome.org/viewvc/pango?rev=2738&view=rev

Log:
2008-11-19  Behdad Esfahbod  <behdad gnome org>

        Bug 560730 â pango 1.22.2 build failure on Solaris 10, too many array
        initializers in pango-language.c

        * pango/pango-language.c: Don't use anonymous struct.

Modified:
   trunk/ChangeLog
   trunk/pango/pango-language.c

Modified: trunk/pango/pango-language.c
==============================================================================
--- trunk/pango/pango-language.c	(original)
+++ trunk/pango/pango-language.c	Wed Nov 19 19:52:30 2008
@@ -481,13 +481,15 @@
 /* Pure black magic, based on appendix of dsohowto.pdf */
 #define POOLSTRFIELD(line) POOLSTRFIELD1(line)
 #define POOLSTRFIELD1(line) str##line
-static const union _LangPool {
-  struct {
-    char str0[1];
+struct _LangPoolStruct {
+  char str0[1];
 #define LANGUAGE(id, source, sample) char POOLSTRFIELD(__LINE__)[sizeof(sample)];
 #include "pango-language-sample-table.h"
 #undef LANGUAGE
-  };
+};
+
+static const union _LangPool {
+  struct _LangPoolStruct lang_pool_struct;
   const char str[1];
 } lang_pool = { {
     "",
@@ -496,7 +498,7 @@
 #undef LANGUAGE
 } };
 static const LangInfo lang_texts[] = {
-#define LANGUAGE(id, source, sample) {G_STRINGIFY(id),	G_STRUCT_OFFSET(union _LangPool, POOLSTRFIELD(__LINE__))},
+#define LANGUAGE(id, source, sample) {G_STRINGIFY(id),	G_STRUCT_OFFSET(struct _LangPoolStruct, POOLSTRFIELD(__LINE__))},
 #include "pango-language-sample-table.h"
 #undef LANGUAGE
   /* One extra entry with no final comma, to make it C89-happy */