From 46f4e3aeeeb33d8591ba7d0b2914512d7468bbf8 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 20 Aug 2002 19:20:48 +0000 Subject: Patch from Nils Nordman to add various missing 'static' (#90353) Tue Aug 20 15:06:50 2002 Owen Taylor * modules/arabic/arabic-xft.c modules/arabic/arabic-ft2.c modules/basic/tables-big.i modules/basic/tables-small.i modules/hebrew/hebrew-ft2.c modules/hebrew/hebrew-xft.c: Patch from Nils Nordman to add various missing 'static' (#90353) --- ChangeLog | 8 ++++++++ ChangeLog.pre-1-10 | 8 ++++++++ ChangeLog.pre-1-2 | 8 ++++++++ ChangeLog.pre-1-4 | 8 ++++++++ ChangeLog.pre-1-6 | 8 ++++++++ ChangeLog.pre-1-8 | 8 ++++++++ modules/arabic/arabic-fc.c | 2 +- modules/arabic/arabic-ft2.c | 2 +- modules/arabic/arabic-xft.c | 2 +- modules/basic/tables-big.i | 8 ++++---- modules/basic/tables-small.i | 6 +++--- modules/hebrew/hebrew-ft2.c | 3 ++- 12 files changed, 60 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4fb282a5..659de038 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Aug 20 15:06:50 2002 Owen Taylor + + * modules/arabic/arabic-xft.c modules/arabic/arabic-ft2.c + modules/basic/tables-big.i modules/basic/tables-small.i + modules/hebrew/hebrew-ft2.c modules/hebrew/hebrew-xft.c: + Patch from Nils Nordman to add various missing 'static' + (#90353) + Mon Aug 19 14:07:02 2002 Owen Taylor * pango/pangofc-fontmap.cI (pango_fc_font_map_get_patterns): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 4fb282a5..659de038 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,11 @@ +Tue Aug 20 15:06:50 2002 Owen Taylor + + * modules/arabic/arabic-xft.c modules/arabic/arabic-ft2.c + modules/basic/tables-big.i modules/basic/tables-small.i + modules/hebrew/hebrew-ft2.c modules/hebrew/hebrew-xft.c: + Patch from Nils Nordman to add various missing 'static' + (#90353) + Mon Aug 19 14:07:02 2002 Owen Taylor * pango/pangofc-fontmap.cI (pango_fc_font_map_get_patterns): diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 4fb282a5..659de038 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,11 @@ +Tue Aug 20 15:06:50 2002 Owen Taylor + + * modules/arabic/arabic-xft.c modules/arabic/arabic-ft2.c + modules/basic/tables-big.i modules/basic/tables-small.i + modules/hebrew/hebrew-ft2.c modules/hebrew/hebrew-xft.c: + Patch from Nils Nordman to add various missing 'static' + (#90353) + Mon Aug 19 14:07:02 2002 Owen Taylor * pango/pangofc-fontmap.cI (pango_fc_font_map_get_patterns): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 4fb282a5..659de038 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,11 @@ +Tue Aug 20 15:06:50 2002 Owen Taylor + + * modules/arabic/arabic-xft.c modules/arabic/arabic-ft2.c + modules/basic/tables-big.i modules/basic/tables-small.i + modules/hebrew/hebrew-ft2.c modules/hebrew/hebrew-xft.c: + Patch from Nils Nordman to add various missing 'static' + (#90353) + Mon Aug 19 14:07:02 2002 Owen Taylor * pango/pangofc-fontmap.cI (pango_fc_font_map_get_patterns): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 4fb282a5..659de038 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,11 @@ +Tue Aug 20 15:06:50 2002 Owen Taylor + + * modules/arabic/arabic-xft.c modules/arabic/arabic-ft2.c + modules/basic/tables-big.i modules/basic/tables-small.i + modules/hebrew/hebrew-ft2.c modules/hebrew/hebrew-xft.c: + Patch from Nils Nordman to add various missing 'static' + (#90353) + Mon Aug 19 14:07:02 2002 Owen Taylor * pango/pangofc-fontmap.cI (pango_fc_font_map_get_patterns): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 4fb282a5..659de038 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,11 @@ +Tue Aug 20 15:06:50 2002 Owen Taylor + + * modules/arabic/arabic-xft.c modules/arabic/arabic-ft2.c + modules/basic/tables-big.i modules/basic/tables-small.i + modules/hebrew/hebrew-ft2.c modules/hebrew/hebrew-xft.c: + Patch from Nils Nordman to add various missing 'static' + (#90353) + Mon Aug 19 14:07:02 2002 Owen Taylor * pango/pangofc-fontmap.cI (pango_fc_font_map_get_patterns): diff --git a/modules/arabic/arabic-fc.c b/modules/arabic/arabic-fc.c index e0ddc696..b7958f2d 100644 --- a/modules/arabic/arabic-fc.c +++ b/modules/arabic/arabic-fc.c @@ -44,7 +44,7 @@ static PangoEngineInfo script_engines[] = { } }; -void +static void maybe_add_feature (PangoOTRuleset *ruleset, PangoOTInfo *info, guint script_index, diff --git a/modules/arabic/arabic-ft2.c b/modules/arabic/arabic-ft2.c index 3849851b..4ac27115 100644 --- a/modules/arabic/arabic-ft2.c +++ b/modules/arabic/arabic-ft2.c @@ -49,7 +49,7 @@ static PangoEngineInfo script_engines[] = { } }; -void +static void maybe_add_feature (PangoOTRuleset *ruleset, PangoOTInfo *info, guint script_index, diff --git a/modules/arabic/arabic-xft.c b/modules/arabic/arabic-xft.c index e0ddc696..b7958f2d 100644 --- a/modules/arabic/arabic-xft.c +++ b/modules/arabic/arabic-xft.c @@ -44,7 +44,7 @@ static PangoEngineInfo script_engines[] = { } }; -void +static void maybe_add_feature (PangoOTRuleset *ruleset, PangoOTInfo *info, guint script_index, diff --git a/modules/basic/tables-big.i b/modules/basic/tables-big.i index 40759660..f8cee9d0 100644 --- a/modules/basic/tables-big.i +++ b/modules/basic/tables-big.i @@ -31,7 +31,7 @@ enum { ENC_ISO_10646 = 1 << 29 }; -Charset charsets[] = { +static Charset charsets[] = { { 0, NULL, "iso8859-1", conv_ucs4 }, { 1, "ISO-8859-2", "iso8859-2", conv_8bit }, { 2, "ISO-8859-3", "iso8859-3", conv_8bit }, @@ -64,7 +64,7 @@ Charset charsets[] = { { 29, NULL, "iso10646-1", conv_ucs4 } }; -CharsetOrdering charset_orderings[] = { +static CharsetOrdering charset_orderings[] = { { "ja", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 19, 16, 17, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29} }, { "ko", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 17, 15, 16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29} }, { "zh-cn", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 22, 23, 28, 16, 17, 15, 18, 19, 20, 21, 24, 25, 26, 27, 29} }, @@ -73,7 +73,7 @@ CharsetOrdering charset_orderings[] = { { "zh-hk", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 24, 20, 21, 25, 26, 27, 22, 23, 16, 17, 15, 18, 19, 28, 29} }, { NULL, { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 29, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28} } }; -const guint32 char_mask_map[] = { +static const guint32 char_mask_map[] = { 0, ENC_ISO_8859_10|ENC_ISO_8859_1|ENC_ISO_8859_13|ENC_ISO_8859_14|ENC_ISO_8859_15|ENC_ISO_8859_2|ENC_ISO_8859_3|ENC_ISO_8859_4|ENC_ISO_8859_5|ENC_ISO_8859_6|ENC_ISO_8859_7|ENC_ISO_8859_8|ENC_ISO_8859_9|ENC_KOI8_R, ENC_ISO_8859_10|ENC_ISO_8859_1|ENC_ISO_8859_13|ENC_ISO_8859_14|ENC_ISO_8859_15|ENC_ISO_8859_2|ENC_ISO_8859_3|ENC_ISO_8859_4|ENC_ISO_8859_5|ENC_ISO_8859_6|ENC_ISO_8859_7|ENC_ISO_8859_8|ENC_ISO_8859_9|ENC_JIS_0201|ENC_KOI8_R|ENC_TIS_620, @@ -297,7 +297,7 @@ const guint32 char_mask_map[] = { ENC_BIG5|ENC_BIG5|ENC_BIG5|ENC_BIG5|ENC_BIG5|ENC_BIG5|ENC_BIG5, }; -const guchar char_masks[] = { +static const guchar char_masks[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, diff --git a/modules/basic/tables-small.i b/modules/basic/tables-small.i index c626913b..98abb3a4 100644 --- a/modules/basic/tables-small.i +++ b/modules/basic/tables-small.i @@ -14,7 +14,7 @@ enum { ENC_ISO_10646 = 1 << 12 }; -Charset charsets[] = { +static Charset charsets[] = { { 0, NULL, "iso8859-1", conv_ucs4 }, { 1, "ISO-8859-2", "iso8859-2", conv_8bit }, { 2, "ISO-8859-3", "iso8859-3", conv_8bit }, @@ -36,7 +36,7 @@ static PangoEngineRange basic_ranges[] = { { 0x2015, 0x2017, "*" }, }; -const guint32 char_mask_map[] = { +static const guint32 char_mask_map[] = { 0, ENC_ISO_8859_1|ENC_ISO_8859_2|ENC_ISO_8859_3|ENC_ISO_8859_4|ENC_ISO_8859_5|ENC_ISO_8859_6|ENC_ISO_8859_7|ENC_ISO_8859_8|ENC_ISO_8859_9, ENC_ISO_8859_1|ENC_ISO_8859_2|ENC_ISO_8859_3|ENC_ISO_8859_4|ENC_ISO_8859_5|ENC_ISO_8859_7|ENC_ISO_8859_8|ENC_ISO_8859_9, @@ -69,7 +69,7 @@ const guint32 char_mask_map[] = { ENC_ISO_8859_6 }; -const guchar char_masks[] = { +static const guchar char_masks[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, diff --git a/modules/hebrew/hebrew-ft2.c b/modules/hebrew/hebrew-ft2.c index 3470a137..ef84f1b7 100644 --- a/modules/hebrew/hebrew-ft2.c +++ b/modules/hebrew/hebrew-ft2.c @@ -68,7 +68,8 @@ get_glyph (PangoFont *font, } /* This should be extended to support various encodings... */ -gint get_glyph_num(PangoFont *font, +static gint +get_glyph_num(PangoFont *font, gunichar uch) { return uch; -- cgit v1.2.1