From 61ccfaedf174ffc7178cff16181e0e95005bb4f4 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 19 Nov 2008 19:52:30 +0000 Subject: [PATCH] =?utf8?q?Bug=20560730=20=E2=80=93=20pango=201.22.2=20buil?= =?utf8?q?d=20failure=20on=20Solaris=2010,=20too=20many=20array?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-11-19 Behdad Esfahbod 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. svn path=/trunk/; revision=2738 --- ChangeLog | 7 +++++++ pango/pango-language.c | 12 +++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59e8f2c..6bdb997 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-11-19 Behdad Esfahbod + 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. + +2008-11-19 Behdad Esfahbod + * pango/pango-ot-info.c (pango_ot_info_get_gdef), (pango_ot_info_get_gsub), (pango_ot_info_get_gpos): Write error code in capital hex. diff --git a/pango/pango-language.c b/pango/pango-language.c index 6eac5df..9f29563 100644 --- a/pango/pango-language.c +++ b/pango/pango-language.c @@ -481,13 +481,15 @@ typedef struct { /* 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 @@ static const union _LangPool { #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 */ -- 2.7.4