diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2008-12-26 02:20:59 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2008-12-26 02:20:59 +0000 |
commit | 069472e0b2bb810e335c0e28a37dcb71e6843030 (patch) | |
tree | b951fc3e6921d9fd675e3ac93ee7350c574bf6cc /pango/fonts.c | |
parent | cea6473bcf6456e531304fc23c473e33475ad05c (diff) | |
download | pango-069472e0b2bb810e335c0e28a37dcb71e6843030.tar.gz |
Fix warnings.
2008-12-25 Behdad Esfahbod <behdad@gnome.org>
* pango/break.c (pango_default_break):
* pango/fonts.c (find_field_any), (pango_font_class_init),
(pango_font_init), (pango_font_metrics_ref),
(pango_font_metrics_unref), (pango_font_family_class_init),
(pango_font_family_init), (pango_font_face_class_init),
(pango_font_face_init):
* pango/pango-attributes.c (pango_attr_list_ref),
(pango_attr_list_unref), (pango_attr_iterator_get_font):
* pango/pango-layout.c (pango_layout_set_height), (extents_free),
(no_shape_filter_func), (pango_layout_line_ref),
(pango_layout_line_unref), (pango_layout_get_item_properties):
* pango/pango-markup.c (end_element_handler), (text_handler),
(b_parse_func), (big_parse_func), (span_parse_func),
(i_parse_func), (markup_parse_func), (s_parse_func),
(sub_parse_func), (sup_parse_func), (small_parse_func),
(tt_parse_func), (u_parse_func):
* pango/pango-ot-info.c (get_glyph_class):
* pango/pango-renderer.c (get_item_properties),
(pango_renderer_default_prepare_run):
* pango/pango-utils.c (_pango_shape_shape):
* pango/pangocairo-fcfontmap.c
(pango_cairo_fc_font_map_get_font_type),
(pango_cairo_fc_font_map_context_substitute),
(pango_cairo_fc_font_map_context_key_get),
(pango_cairo_fc_font_map_context_key_copy),
(pango_cairo_fc_font_map_context_key_free),
(pango_cairo_fc_font_map_context_key_hash),
(pango_cairo_fc_font_map_context_key_equal):
* pango/pangocairo-fontmap.c
(pango_cairo_font_map_new_for_font_type),
(pango_cairo_font_map_set_default):
* pango/pangocairo-render.c (pango_cairo_renderer_init):
* pango/pangox-fontcache.c (free_cache_entry):
* pango/pangox-fontmap.c (close_display_cb),
(list_families_foreach), (pango_x_font_map_load_font),
(ignore_error):
* pango/pangox.c (average_width_foreach), (subfonts_foreach),
(pango_x_font_find_shaper), (pango_x_get_unknown_glyph),
(pango_x_get_item_properties), (pango_x_apply_ligatures),
(pango_x_font_get_unknown_glyph):
* pango/pangoxft-fontmap.c (pango_xft_font_map_init),
(close_display_cb):
* pango/querymodules.c (show_version):
Fix warnings.
svn path=/trunk/; revision=2765
Diffstat (limited to 'pango/fonts.c')
-rw-r--r-- | pango/fonts.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pango/fonts.c b/pango/fonts.c index 34c0e248..74b36ab5 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -946,7 +946,7 @@ find_field_any (const char *str, int len, PangoFontDescription *desc) #define FIELD(NAME, MASK) \ G_STMT_START { \ if (find_field (NAME##_map, G_N_ELEMENTS (NAME##_map), str, len, \ - desc ? (int *)&desc->NAME : NULL)) \ + desc ? (int *)(void *)&desc->NAME : NULL)) \ { \ if (desc) \ desc->mask |= MASK; \ @@ -1248,12 +1248,12 @@ pango_font_description_to_filename (const PangoFontDescription *desc) G_DEFINE_ABSTRACT_TYPE (PangoFont, pango_font, G_TYPE_OBJECT) static void -pango_font_class_init (PangoFontClass *class) +pango_font_class_init (PangoFontClass *class G_GNUC_UNUSED) { } static void -pango_font_init (PangoFont *font) +pango_font_init (PangoFont *font G_GNUC_UNUSED) { } @@ -1510,7 +1510,7 @@ pango_font_metrics_ref (PangoFontMetrics *metrics) if (metrics == NULL) return NULL; - g_atomic_int_inc (&metrics->ref_count); + g_atomic_int_inc ((int *) &metrics->ref_count); return metrics; } @@ -1531,7 +1531,7 @@ pango_font_metrics_unref (PangoFontMetrics *metrics) g_return_if_fail (metrics->ref_count > 0 ); - if (g_atomic_int_dec_and_test (&metrics->ref_count)) + if (g_atomic_int_dec_and_test ((int *) &metrics->ref_count)) g_slice_free (PangoFontMetrics, metrics); } @@ -1700,12 +1700,12 @@ pango_font_metrics_get_strikethrough_thickness (PangoFontMetrics *metrics) G_DEFINE_ABSTRACT_TYPE (PangoFontFamily, pango_font_family, G_TYPE_OBJECT) static void -pango_font_family_class_init (PangoFontFamilyClass *class) +pango_font_family_class_init (PangoFontFamilyClass *class G_GNUC_UNUSED) { } static void -pango_font_family_init (PangoFontFamily *family) +pango_font_family_init (PangoFontFamily *family G_GNUC_UNUSED) { } @@ -1789,12 +1789,12 @@ pango_font_family_is_monospace (PangoFontFamily *family) G_DEFINE_ABSTRACT_TYPE (PangoFontFace, pango_font_face, G_TYPE_OBJECT) static void -pango_font_face_class_init (PangoFontFaceClass *class) +pango_font_face_class_init (PangoFontFaceClass *class G_GNUC_UNUSED) { } static void -pango_font_face_init (PangoFontFace *face) +pango_font_face_init (PangoFontFace *face G_GNUC_UNUSED) { } |