--- String-Similarity/fstrcmp.c	2005/06/25 09:55:53	1.1
+++ String-Similarity/fstrcmp.c	2008/11/04 15:31:38	1.2
@@ -45,9 +45,7 @@
 
 #include "fstrcmp.h"
 
-/* moved here from fstrcmp.h to avoid problems on lose32 machines */
 #define PARAMS(proto) proto
-typedef UV CHAR;
 
 /*
  * Data on one input string being compared.
@@ -55,7 +53,7 @@
 struct string_data
 {
   /* The string to be compared. */
-  const CHAR *data;
+  const UV *data;
 
   /* The length of the string to be compared. */
   int data_length;
@@ -166,8 +164,8 @@
 {
   int *const fd = fdiag;	/* Give the compiler a chance. */
   int *const bd = bdiag;	/* Additional help for the compiler. */
-  const CHAR *const xv = string[0].data;	/* Still more help for the compiler. */
-  const CHAR *const yv = string[1].data;	/* And more and more . . . */
+  const UV *const xv = string[0].data;	/* Still more help for the compiler. */
+  const UV *const yv = string[1].data;	/* And more and more . . . */
   const int dmin = xoff - ylim;	/* Minimum valid diagonal. */
   const int dmax = xlim - yoff;	/* Maximum valid diagonal. */
   const int fmid = xoff - yoff;	/* Center diagonal of top-down search. */
@@ -490,8 +488,8 @@
      int ylim;
      int minimal;
 {
-  const CHAR *const xv = string[0].data;	/* Help the compiler.  */
-  const CHAR *const yv = string[1].data;
+  const UV *const xv = string[0].data;	/* Help the compiler.  */
+  const UV *const yv = string[1].data;
 
   if (string[1].edit_count + string[0].edit_count > max_edits)
     return;
@@ -565,7 +563,7 @@
 	fstrcmp - fuzzy string compare
 
    SYNOPSIS
-	double fstrcmp(const CHAR *s1, int l1, const CHAR *s2, int l2, double);
+	double fstrcmp(const ChaR *s1, int l1, const UV *s2, int l2, double);
 
    DESCRIPTION
 	The fstrcmp function may be used to compare two string for
@@ -579,8 +577,8 @@
 	similar.  */
 
 double
-fstrcmp (const CHAR *string1, int length1,
-         const CHAR *string2, int length2,
+fstrcmp (const UV *string1, int length1,
+         const UV *string2, int length2,
          double minimum)
 {
   int i;