Remove stray semicolon.

	* modules/arabic/arabic-x.c: (arabic_engine_shape): Remove stray
	semicolon.

	* modules/arabic/arconv.h:
	* modules/arabic/arconv.c: (shape), (doublelig), (arabic_reshape):
	Use long* instead of int* for parameter to match what's passed in.

	* modules/indic/bengali-x.c: Add missing <string.h> include.
	(pango_indic_make_ligs): Use local variable that was added but not
	ever used.
	(pango_indic_engine_shape): Remove unused locals.

	* modules/indic/devanagari-x.c: Add missing <string.h> include.
	(pango_indic_engine_shape): Remove unused local.

	* modules/indic/gujarati-x.c: Add missing <string.h> include.
	(pango_indic_engine_shape): Remove unused local

	* modules/tamil/tamil-x.c: (tamil_engine_shape): Initialize a
	variable to quiet the compiler's unused warning.

	* pango/.cvsignore: Ignore more generated files.

	* pango/opentype/ftxgpos.c: (Get_Anchor): Add code to set up the
	ap variable. The old code would just use the uninitialized value.

	* pango/opentype/ftxopen.c: (Load_Coverage): Remove unused local.

	* pango/opentype/pango-ot-ruleset.c: (pango_ot_ruleset_shape):
	Remove unused local.

	* pango/pango-attributes.c: (pango_attr_list_get_type),
	(pango_color_get_type): Add needed function type casts (just
	warnings under gcc, but could be errors in other compilers).

	* pango/pangoxft-font.c: (pango_xft_font_get_metrics),
	(pango_xft_font_get_coverage), (pango_xft_get_shaper_map),
	(pango_xft_font_find_shaper): Switch from lang char* to
	PangoLanguage*. The code was still compiling, but would not have
	worked.

6 files changed, 19 insertions, 20 deletions

diff --git a/pango/.cvsignore b/pango/.cvsignore
index e4fe6f74..2cb95eae 100644
--- a/pango/.cvsignore
+++ b/pango/.cvsignore
@@ -5,6 +5,7 @@ pango.rc
 pangoft2.rc
 pangowin32.rc
 pango-enum-types.[ch]
+s-enum-types-[ch]
 pango-querymodules
 module-defs.h
 module-defs-x.c
diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c
index 48d50099..07d73d9f 100644
--- a/pango/opentype/ftxgpos.c
+++ b/pango/opentype/ftxgpos.c
@@ -873,6 +873,8 @@
 
 	if ( gpi->face->glyph->format != ft_glyph_format_outline )
           return TTO_Err_Invalid_GPOS_SubTable;	  
+
+	ap = an->af.af2.AnchorPoint;
 	
 	outline = gpi->face->glyph->outline;
 
diff --git a/pango/opentype/ftxopen.c b/pango/opentype/ftxopen.c
index 5ffe030a..07a50290 100644
--- a/pango/opentype/ftxopen.c
+++ b/pango/opentype/ftxopen.c
@@ -851,7 +851,6 @@
 			   FT_Stream      stream )
   {
     FT_Error   error;
-    FT_Memory  memory = stream->memory;
 
     if ( ACCESS_Frame( 2L ) )
       return error;
diff --git a/pango/opentype/pango-ot-ruleset.c b/pango/opentype/pango-ot-ruleset.c
index 79245b5a..1a003a97 100644
--- a/pango/opentype/pango-ot-ruleset.c
+++ b/pango/opentype/pango-ot-ruleset.c
@@ -133,7 +133,6 @@ pango_ot_ruleset_shape (PangoOTRuleset   *ruleset,
   TTO_GSUB_String *in_string = NULL;
   TTO_GSUB_String *out_string = NULL;
   TTO_GSUB_String *result_string = NULL;
-  TTO_GPOS_Data *pos_data;
 
   gboolean need_gsub = FALSE;
   gboolean need_gpos = FALSE;
diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
index b1748b88..66accc6b 100644
--- a/pango/pango-attributes.c
+++ b/pango/pango-attributes.c
@@ -718,8 +718,8 @@ pango_attr_list_get_type (void)
   if (our_type == 0)
     our_type = g_boxed_type_register_static ("PangoAttrList",
 					     NULL,
-					     pango_attr_list_copy,
-					     pango_attr_list_unref,
+					     (GBoxedCopyFunc) pango_attr_list_copy,
+					     (GBoxedFreeFunc) pango_attr_list_unref,
 					     FALSE);
 
   return our_type;
@@ -1548,8 +1548,8 @@ pango_color_get_type (void)
   if (our_type == 0)
     our_type = g_boxed_type_register_static ("PangoColor",
 					     NULL,
-					     pango_color_copy,
-					     pango_color_free,
+					     (GBoxedCopyFunc) pango_color_copy,
+					     (GBoxedFreeFunc) pango_color_free,
 					     FALSE);
 
   return our_type;
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c
index 243aaa09..96edd72c 100644
--- a/pango/pangoxft-font.c
+++ b/pango/pangoxft-font.c
@@ -46,16 +46,16 @@ static void pango_xft_font_finalize   (GObject         *object);
 
 static PangoFontDescription *pango_xft_font_describe          (PangoFont        *font);
 static PangoCoverage *       pango_xft_font_get_coverage      (PangoFont        *font,
-							       const char       *lang);
+							       PangoLanguage    *language);
 static PangoEngineShape *    pango_xft_font_find_shaper       (PangoFont        *font,
-							       const char       *lang,
+							       PangoLanguage    *language,
 							       guint32           ch);
 static void                  pango_xft_font_get_glyph_extents (PangoFont        *font,
 							       PangoGlyph        glyph,
 							       PangoRectangle   *ink_rect,
 							       PangoRectangle   *logical_rect);
 static void                  pango_xft_font_get_metrics       (PangoFont        *font,
-							       const gchar      *lang,
+							       PangoLanguage    *language,
 							       PangoFontMetrics *metrics);
 
 
@@ -282,7 +282,7 @@ pango_xft_render (XftDraw          *draw,
 
 static void
 pango_xft_font_get_metrics (PangoFont        *font,
-			    const gchar      *lang,
+			    PangoLanguage    *language,
 			    PangoFontMetrics *metrics)
 {
   PangoXftFont *xfont = (PangoXftFont *)font;
@@ -291,8 +291,6 @@ pango_xft_font_get_metrics (PangoFont        *font,
   metrics->descent = PANGO_SCALE * xfont->xft_font->descent;
   metrics->approximate_digit_width = PANGO_SCALE * xfont->xft_font->max_advance_width;
   metrics->approximate_char_width = PANGO_SCALE * xfont->xft_font->max_advance_width;
-  
-  return;
 }
 
 static void
@@ -335,8 +333,8 @@ pango_xft_font_describe (PangoFont *font)
 }
 
 static PangoCoverage *
-pango_xft_font_get_coverage (PangoFont  *font,
-			     const char *lang)
+pango_xft_font_get_coverage (PangoFont     *font,
+			     PangoLanguage *language)
 {
   PangoXftFont *xfont = (PangoXftFont *)font;
   FT_Face face;
@@ -428,7 +426,7 @@ pango_xft_font_get_glyph_extents (PangoFont        *font,
 }
 
 static PangoMap *
-pango_xft_get_shaper_map (const char *lang)
+pango_xft_get_shaper_map (PangoLanguage *language)
 {
   static guint engine_type_id = 0;
   static guint render_type_id = 0;
@@ -439,17 +437,17 @@ pango_xft_get_shaper_map (const char *lang)
       render_type_id = g_quark_from_static_string (PANGO_RENDER_TYPE_XFT);
     }
   
-  return pango_find_map (lang, engine_type_id, render_type_id);
+  return pango_find_map (language, engine_type_id, render_type_id);
 }
 
 static PangoEngineShape *
-pango_xft_font_find_shaper (PangoFont   *font,
-			  const gchar *lang,
-			  guint32      ch)
+pango_xft_font_find_shaper (PangoFont     *font,
+			    PangoLanguage *language,
+			    guint32        ch)
 {
   PangoMap *shape_map = NULL;
 
-  shape_map = pango_xft_get_shaper_map (lang);
+  shape_map = pango_xft_get_shaper_map (language);
   return (PangoEngineShape *)pango_map_get_engine (shape_map, ch);
 }