diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
-rw-r--r-- | pango/pangox-fontmap.c | 6 | ||||
-rw-r--r-- | pango/pangox.c | 4 |
6 files changed, 25 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Thu May 27 15:42:20 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangox-fontmap.c pango/pangox.c: Add some missing + statics. (#142299, Morten Welinder) + Thu May 27 15:32:03 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-font.h pango/fonts.c: Add underline and diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 83ea0791..4b7df6b1 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Thu May 27 15:42:20 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangox-fontmap.c pango/pangox.c: Add some missing + statics. (#142299, Morten Welinder) + Thu May 27 15:32:03 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-font.h pango/fonts.c: Add underline and diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 83ea0791..4b7df6b1 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Thu May 27 15:42:20 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangox-fontmap.c pango/pangox.c: Add some missing + statics. (#142299, Morten Welinder) + Thu May 27 15:32:03 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-font.h pango/fonts.c: Add underline and diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 83ea0791..4b7df6b1 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Thu May 27 15:42:20 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangox-fontmap.c pango/pangox.c: Add some missing + statics. (#142299, Morten Welinder) + Thu May 27 15:32:03 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-font.h pango/fonts.c: Add underline and diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c index b99ee2e4..0227da28 100644 --- a/pango/pangox-fontmap.c +++ b/pango/pangox-fontmap.c @@ -96,7 +96,7 @@ struct _PangoXSizeInfo GSList *xlfds; }; -const struct { +static const struct { const gchar *text; PangoWeight value; } weights_map[] = { @@ -113,7 +113,7 @@ const struct { { "black", 900 } }; -const struct { +static const struct { const gchar *text; PangoStyle value; } styles_map[] = { @@ -122,7 +122,7 @@ const struct { { "o", PANGO_STYLE_OBLIQUE } }; -const struct { +static const struct { const gchar *text; PangoStretch value; } stretches_map[] = { diff --git a/pango/pangox.c b/pango/pangox.c index 7f0dcd98..9668de44 100644 --- a/pango/pangox.c +++ b/pango/pangox.c @@ -850,7 +850,7 @@ get_font_metrics_from_subfonts (PangoFont *font, metrics->approximate_char_width = 10 * PANGO_SCALE; } -void +static void get_subfonts_foreach (PangoFont *font, PangoGlyphInfo *glyph_info, gpointer data) @@ -882,7 +882,7 @@ get_font_metrics_from_string (PangoFont *font, g_slist_free (subfonts); } -void +static void average_width_foreach (PangoFont *font, PangoGlyphInfo *glyph_info, gpointer data) |