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.

3 files changed, 6 insertions, 7 deletions

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;