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.

20 files changed, 338 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index 84fb9d09..99ffc863 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2001-07-12  Darin Adler  <darin@bentspoon.com>
+
+	* 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.
+
 2001-07-02  James Henstridge  <james@daa.com.au>
 
 	* pango/glyphstring.c (pango_glyph_string_copy): copy function.
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 84fb9d09..99ffc863 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,46 @@
+2001-07-12  Darin Adler  <darin@bentspoon.com>
+
+	* 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.
+
 2001-07-02  James Henstridge  <james@daa.com.au>
 
 	* pango/glyphstring.c (pango_glyph_string_copy): copy function.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 84fb9d09..99ffc863 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,46 @@
+2001-07-12  Darin Adler  <darin@bentspoon.com>
+
+	* 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.
+
 2001-07-02  James Henstridge  <james@daa.com.au>
 
 	* pango/glyphstring.c (pango_glyph_string_copy): copy function.
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 84fb9d09..99ffc863 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,46 @@
+2001-07-12  Darin Adler  <darin@bentspoon.com>
+
+	* 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.
+
 2001-07-02  James Henstridge  <james@daa.com.au>
 
 	* pango/glyphstring.c (pango_glyph_string_copy): copy function.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 84fb9d09..99ffc863 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,46 @@
+2001-07-12  Darin Adler  <darin@bentspoon.com>
+
+	* 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.
+
 2001-07-02  James Henstridge  <james@daa.com.au>
 
 	* pango/glyphstring.c (pango_glyph_string_copy): copy function.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 84fb9d09..99ffc863 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,46 @@
+2001-07-12  Darin Adler  <darin@bentspoon.com>
+
+	* 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.
+
 2001-07-02  James Henstridge  <james@daa.com.au>
 
 	* pango/glyphstring.c (pango_glyph_string_copy): copy function.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 84fb9d09..99ffc863 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,46 @@
+2001-07-12  Darin Adler  <darin@bentspoon.com>
+
+	* 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.
+
 2001-07-02  James Henstridge  <james@daa.com.au>
 
 	* pango/glyphstring.c (pango_glyph_string_copy): copy function.
diff --git a/modules/arabic/arabic-x.c b/modules/arabic/arabic-x.c
index 42b4815a..ccd84a91 100644
--- a/modules/arabic/arabic-x.c
+++ b/modules/arabic/arabic-x.c
@@ -229,7 +229,7 @@ arabic_engine_shape (PangoFont        *font,
             n_chars = length;
             arabic_reshape(&n_chars,text,wc,fs->level);
             pango_glyph_string_set_size (glyphs, n_chars);
-        };
+        }
 
 
     p    = text;
diff --git a/modules/arabic/arconv.c b/modules/arabic/arconv.c
index a96e0433..e86abcbe 100644
--- a/modules/arabic/arconv.c
+++ b/modules/arabic/arconv.c
@@ -147,7 +147,7 @@ static shapestruct chartable [] =
 #define LAM_ALIFMADDA   0xFEF5
 
 
-void 
+static void 
 charstruct_init(charstruct* s)
 {
     s->basechar       = 0;
@@ -158,7 +158,7 @@ charstruct_init(charstruct* s)
     s->numshapes      = 1;
 }
  
-void
+static void
 copycstostring(gunichar* string,int* i,charstruct* s,arabic_level level)
 { /* s is a shaped charstruct; i is the index into the string */
     if (s->basechar == 0) return;
@@ -280,7 +280,8 @@ shapecount(gunichar s)
         }
 }
 
-int unligature(charstruct* curchar,arabic_level level)
+static int
+unligature(charstruct* curchar,arabic_level level)
 {
     int result = 0;
     if (level & ar_naqshfont){
@@ -299,7 +300,7 @@ int unligature(charstruct* curchar,arabic_level level)
     return result;
 }
 
-int 
+static int 
 ligature(gunichar newchar,charstruct* oldchar)
 { /* no ligature possible --> return 0; 1 == vowel; 2 = two chars 
    * 3 = Lam-Alif
@@ -424,7 +425,7 @@ ligature(gunichar newchar,charstruct* oldchar)
 }
 
 static void 
-shape(int* len,const char* text,gunichar* string,arabic_level level)
+shape(long* len,const char* text,gunichar* string,arabic_level level)
 {
     /* string is assumed to be empty an big enough.
     ** text is the original text.
@@ -523,7 +524,7 @@ shape(int* len,const char* text,gunichar* string,arabic_level level)
 }
 
 static void 
-doublelig(int* len,gunichar* string,arabic_level level)
+doublelig(long* len,gunichar* string,arabic_level level)
 { /* Ok. We have presentation ligatures in our font. */
     int         olen = *len;
     int         j = 0, si = 1;
@@ -637,12 +638,9 @@ doublelig(int* len,gunichar* string,arabic_level level)
 }
 
 void 
-arabic_reshape(int* len,const char* text,gunichar* string,arabic_level level)
+arabic_reshape(long* len,const char* text,gunichar* string,arabic_level level)
 {
     shape(len,text ,string,level);
     if ( level & ( ar_composedtashkeel | ar_lig ) )
         doublelig(len,string,level);
 }
-
-
-
diff --git a/modules/arabic/arconv.h b/modules/arabic/arconv.h
index 57ee7d57..1c7441d9 100644
--- a/modules/arabic/arconv.h
+++ b/modules/arabic/arconv.h
@@ -37,7 +37,7 @@ typedef struct
  *  string: original-string
  *  text  : output-text
  */
-void arabic_reshape(int* len,const char* text,gunichar* string,arabic_level level);
+void arabic_reshape(long* len,const char* text,gunichar* string,arabic_level level);
 int  arabic_isvowel(gunichar s);
 
 #endif
diff --git a/modules/indic/bengali-x.c b/modules/indic/bengali-x.c
index 308d3a23..fd815a79 100644
--- a/modules/indic/bengali-x.c
+++ b/modules/indic/bengali-x.c
@@ -40,6 +40,7 @@
 
 #include <glib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "pangox.h"
 #include "pango-indic.h"
@@ -162,11 +163,10 @@ pango_indic_make_ligs (gunichar * start, gunichar * end)
   int num = end - start;
   int i;
 
-  for (i = 0; i < (end - start); i++)
+  for (i = 0; i < num; i++)
     {
       gunichar t0 = pango_indic_get_char (start + i, end);
       gunichar t1 = pango_indic_get_char (start + 1 + i, end);
-      gunichar t2 = pango_indic_get_char (start + 2 + i, end);
 
        if ((t0 == VIRAMA) && (t1 == 0x9af)) 
 	 {
@@ -182,7 +182,7 @@ pango_indic_make_ligs (gunichar * start, gunichar * end)
        start[2] = RA_SUPERSCRIPT;
      }
    
-   for (i = 0; i < (end - start - 1); i++) 
+   for (i = 0; i < (num - 1); i++) 
      {
        if (start[i] == VIRAMA) 
 	 {
@@ -207,8 +207,7 @@ pango_indic_engine_shape (PangoFont * font,
 
   int n_chars, n_glyph;
   int lvl;
-  const char *p;
-  int i, k;
+  int i;
   gunichar *wc;
   int sb;
   int n_syls;
diff --git a/modules/indic/devanagari-x.c b/modules/indic/devanagari-x.c
index 8c7e1a75..a7e08fb6 100644
--- a/modules/indic/devanagari-x.c
+++ b/modules/indic/devanagari-x.c
@@ -37,6 +37,7 @@
 
 #include <glib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "pangox.h"
 #include "pango-engine.h"
@@ -248,7 +249,6 @@ pango_indic_engine_shape (PangoFont * font,
 
   int n_chars, n_glyph;
   int lvl;
-  const char *p;
   int i;
   gunichar *wc;
   int sb;
diff --git a/modules/indic/gujarati-x.c b/modules/indic/gujarati-x.c
index f5e939dc..20aee4c6 100644
--- a/modules/indic/gujarati-x.c
+++ b/modules/indic/gujarati-x.c
@@ -25,6 +25,7 @@
 
 #include <glib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "pangox.h"
 
@@ -232,7 +233,6 @@ pango_indic_engine_shape (PangoFont * font,
 
   int n_chars, n_glyph;
   int lvl;
-  const char *p;
   int i;
   gunichar *wc;
   int sb;
diff --git a/modules/tamil/tamil-x.c b/modules/tamil/tamil-x.c
index 0e3009db..3807ee35 100644
--- a/modules/tamil/tamil-x.c
+++ b/modules/tamil/tamil-x.c
@@ -205,7 +205,8 @@ tamil_engine_shape (PangoFont        *font,
   int i;
   const char *cluster_start;
   const char *p;
-  gunichar *wc, prevchar,currchar;  
+  gunichar *wc, prevchar;
+  gunichar currchar = 0; /* Quiet compiler */
   int complete; /* Whether the prev char is gauranteed to be complete 
 		   i.e not modified by modifiers */
   int nuni;     /* No. of unicode characters in a cluster */
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);
 }