From c63d3b1b1fbe7a796f2722b467830ce726b78619 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 4 Aug 2009 21:45:40 -0400
Subject: [PATCH] Fix warnings

---
 pango/pangofc-fontmap.c | 5 +----
 pango/querymodules.c    | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index adbafaa..5211361 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -1810,7 +1810,7 @@ pango_fc_font_map_get_font_face_data (PangoFcFontMap *fcfontmap,
   return data;
 }
 
-PangoFcCmapCache *
+static PangoFcCmapCache *
 _pango_fc_cmap_cache_ref (PangoFcCmapCache *cmap_cache)
 {
   g_atomic_int_inc ((int *) &cmap_cache->ref_count);
@@ -1835,7 +1835,6 @@ _pango_fc_font_map_get_cmap_cache (PangoFcFontMap *fcfontmap,
 {
   PangoFcFontMapPrivate *priv;
   PangoFcFontFaceData *data;
-  PangoFcCmapCache *cmap_cache;
 
   if (G_UNLIKELY (fcfontmap == NULL))
 	return NULL;
@@ -1865,9 +1864,7 @@ PangoCoverage *
 _pango_fc_font_map_get_coverage (PangoFcFontMap *fcfontmap,
 				 PangoFcFont    *fcfont)
 {
-  PangoFcFontMapPrivate *priv = fcfontmap->priv;
   PangoFcFontFaceData *data;
-  PangoCoverage *coverage;
   FcCharSet *charset;
 
   if (G_UNLIKELY (!fcfont->font_pattern))
diff --git a/pango/querymodules.c b/pango/querymodules.c
index 45949f8..ef2d09a 100644
--- a/pango/querymodules.c
+++ b/pango/querymodules.c
@@ -182,7 +182,7 @@ query_module (const char *dir, const char *name)
     g_module_close (module);
 }
 
-static gboolean
+static G_GNUC_NORETURN gboolean
 show_version(const char *name G_GNUC_UNUSED,
 	     const char *arg G_GNUC_UNUSED,
 	     gpointer    data G_GNUC_UNUSED,
-- 
2.7.4