From de7871cdd4847fc2ccca73ac61f9ec21d333d2ab Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 21 Jun 2004 18:25:26 +0000 Subject: pango/modules.c (append_engines): Fix some missing statics. (#142237, Mon Jun 21 14:23:05 2004 Owen Taylor * pango/pango-layout.c (no_shape_filter_func) pango/pango-script.c (get_pair_index): pango/modules.c (append_engines): Fix some missing statics. (#142237, Morten Welinder) * pango/mini-fribidi/fribidi_types.c: Move fribidi_type_name inside the #ifdef DEBUG. --- ChangeLog | 10 ++++++++++ ChangeLog.pre-1-10 | 10 ++++++++++ ChangeLog.pre-1-6 | 10 ++++++++++ ChangeLog.pre-1-8 | 10 ++++++++++ pango/mini-fribidi/fribidi_types.c | 4 ++-- pango/modules.c | 2 +- pango/pango-layout.c | 2 +- pango/pango-script.c | 2 +- 8 files changed, 45 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05cd85e1..c0e7b061 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon Jun 21 14:23:05 2004 Owen Taylor + + * pango/pango-layout.c (no_shape_filter_func) + pango/pango-script.c (get_pair_index): + pango/modules.c (append_engines): Fix + some missing statics. (#142237, Morten Welinder) + + * pango/mini-fribidi/fribidi_types.c: Move + fribidi_type_name inside the #ifdef DEBUG. + Mon Jun 21 13:55:17 2004 Owen Taylor * pango/opentype/otlbuffer.c: Use the gcc-3.3 diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 05cd85e1..c0e7b061 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,13 @@ +Mon Jun 21 14:23:05 2004 Owen Taylor + + * pango/pango-layout.c (no_shape_filter_func) + pango/pango-script.c (get_pair_index): + pango/modules.c (append_engines): Fix + some missing statics. (#142237, Morten Welinder) + + * pango/mini-fribidi/fribidi_types.c: Move + fribidi_type_name inside the #ifdef DEBUG. + Mon Jun 21 13:55:17 2004 Owen Taylor * pango/opentype/otlbuffer.c: Use the gcc-3.3 diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 05cd85e1..c0e7b061 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,13 @@ +Mon Jun 21 14:23:05 2004 Owen Taylor + + * pango/pango-layout.c (no_shape_filter_func) + pango/pango-script.c (get_pair_index): + pango/modules.c (append_engines): Fix + some missing statics. (#142237, Morten Welinder) + + * pango/mini-fribidi/fribidi_types.c: Move + fribidi_type_name inside the #ifdef DEBUG. + Mon Jun 21 13:55:17 2004 Owen Taylor * pango/opentype/otlbuffer.c: Use the gcc-3.3 diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 05cd85e1..c0e7b061 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,13 @@ +Mon Jun 21 14:23:05 2004 Owen Taylor + + * pango/pango-layout.c (no_shape_filter_func) + pango/pango-script.c (get_pair_index): + pango/modules.c (append_engines): Fix + some missing statics. (#142237, Morten Welinder) + + * pango/mini-fribidi/fribidi_types.c: Move + fribidi_type_name inside the #ifdef DEBUG. + Mon Jun 21 13:55:17 2004 Owen Taylor * pango/opentype/otlbuffer.c: Use the gcc-3.3 diff --git a/pango/mini-fribidi/fribidi_types.c b/pango/mini-fribidi/fribidi_types.c index 8c6a00ed..b025d033 100644 --- a/pango/mini-fribidi/fribidi_types.c +++ b/pango/mini-fribidi/fribidi_types.c @@ -76,8 +76,6 @@ fribidi_char_from_type (FriBidiCharType c) } }; -#endif - char * fribidi_type_name (FriBidiCharType c) { @@ -116,6 +114,8 @@ fribidi_type_name (FriBidiCharType c) #undef _FRIBIDI_CASE } +#endif + /* Map fribidi_prop_types to fribidi_types. */ static FriBidiCharType fribidi_prop_to_type_array[] = { #define _FRIBIDI_ADD_TYPE(TYPE) FRIBIDI_TYPE_##TYPE, diff --git a/pango/modules.c b/pango/modules.c index 5767f9fd..ceb4f2d5 100644 --- a/pango/modules.c +++ b/pango/modules.c @@ -652,7 +652,7 @@ pango_map_get_engine (PangoMap *map, return NULL; } -void +static void append_engines (GSList **engine_list, GSList *pair_list) { diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 55abd1a1..278c6766 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -2993,7 +2993,7 @@ pango_layout_get_effective_attributes (PangoLayout *layout) return attrs; } -gboolean +static gboolean no_shape_filter_func (PangoAttribute *attribute, gpointer data) { diff --git a/pango/pango-script.c b/pango/pango-script.c index 0de2edaa..b5045c42 100644 --- a/pango/pango-script.c +++ b/pango/pango-script.c @@ -209,7 +209,7 @@ static const gunichar paired_chars[] = { 0x301a, 0x301b }; -int +static int get_pair_index (gunichar ch) { int lower = 0; -- cgit v1.2.1