X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Funicat.h;h=a8b8d61e675bbb6d0ea2578b495897154e55b89f;hb=4eb40e82d22f0fda4b807c2e9204e5c0bae1db74;hp=1ddfb8e62fd818e3be642f948bfa24f6f133fa61;hpb=0c4c92ea6a27b21551bd17a2a84a30e568cda660;p=libucw.git

diff --git a/charset/unicat.h b/charset/unicat.h
index 1ddfb8e6..a8b8d61e 100644
--- a/charset/unicat.h
+++ b/charset/unicat.h
@@ -7,11 +7,11 @@
  *	of the GNU Lesser General Public License.
  */
 
-#ifndef _UNICAT_H
-#define _UNICAT_H
+#ifndef _CHARSET_UNICAT_H
+#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)
 {
@@ -23,23 +23,23 @@ static inline uns Ucategory(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)
 {
-  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)
 {
-  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;
 }
 
-extern const word *Uexpand_lig(uns x);
+extern const u16 *Uexpand_lig(uns x);
 
 enum unicode_char_type {
   _U_LETTER = 1,		/* Letters */