Better messages and sort-test controls.

[libucw.git] / charset / unicat.h

diff --git a/charset/unicat.h b/charset/unicat.h
index 021ec5c2eb4106b950fa257fc2bf2ca62d7867fc..a8b8d61e675bbb6d0ea2578b495897154e55b89f 100644 (file)
--- a/charset/unicat.h
+++ b/charset/unicat.h
@@ -11,7 +11,7 @@
 #define _CHARSET_UNICAT_H
 
 extern const byte *_U_cat[];
 #define _CHARSET_UNICAT_H
 
 extern const byte *_U_cat[];

-extern const word *_U_upper[], *_U_lower[], *_U_unaccent[];
+extern const u16 *_U_upper[], *_U_lower[], *_U_unaccent[];

 
 static inline uns Ucategory(uns x)
 {
 
 static inline uns Ucategory(uns x)
 {


@@ -23,23 +23,23 @@ static inline uns Ucategory(uns x)
 
 static inline uns Utoupper(uns x)
 {
 
 static inline uns Utoupper(uns x)
 {

-  word w = (_U_upper[x >> 8U]) ? _U_upper[x >> 8U][x & 0xff] : 0;
+  uns w = (_U_upper[x >> 8U]) ? _U_upper[x >> 8U][x & 0xff] : 0;

   return w ? w : x;
 }
 
 static inline uns Utolower(uns x)
 {
   return w ? w : x;
 }
 
 static inline uns Utolower(uns x)
 {

-  word w = (_U_lower[x >> 8U]) ? _U_lower[x >> 8U][x & 0xff] : 0;
+  uns w = (_U_lower[x >> 8U]) ? _U_lower[x >> 8U][x & 0xff] : 0;

   return w ? w : x;
 }
 
 static inline uns Uunaccent(uns x)
 {
   return w ? w : x;
 }
 
 static inline uns Uunaccent(uns x)
 {

-  word w = (_U_unaccent[x >> 8U]) ? _U_unaccent[x >> 8U][x & 0xff] : 0;
+  uns w = (_U_unaccent[x >> 8U]) ? _U_unaccent[x >> 8U][x & 0xff] : 0;

   return w ? w : x;
 }
 
   return w ? w : x;
 }
 

-extern const word *Uexpand_lig(uns x);
+extern const u16 *Uexpand_lig(uns x);

 
 enum unicode_char_type {
   _U_LETTER = 1,               /* Letters */
 
 enum unicode_char_type {
   _U_LETTER = 1,               /* Letters */