Merge remote-tracking branch 'origin/master'

[libucw.git] / charset / unicat.h

diff --git a/charset/unicat.h b/charset/unicat.h
index a8b8d61e675bbb6d0ea2578b495897154e55b89f..78f99eb4bf9c6238e02e0a5e5f62bde1f87ad589 100644 (file)
--- a/charset/unicat.h
+++ b/charset/unicat.h
@@ -10,10 +10,18 @@
 #ifndef _CHARSET_UNICAT_H
 #define _CHARSET_UNICAT_H
 
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define Uexpand_lig ucw_Uexpand_lig
+#define _U_cat ucw__U_cat
+#define _U_lower ucw__U_lower
+#define _U_unaccent ucw__U_unaccent
+#define _U_upper ucw__U_upper
+#endif
+
 extern const byte *_U_cat[];
 extern const u16 *_U_upper[], *_U_lower[], *_U_unaccent[];
 
-static inline uns Ucategory(uns x)
+static inline uint Ucategory(uint x)
 {
   if (_U_cat[x >> 8U])
     return _U_cat[x >> 8U][x & 0xff];
@@ -21,25 +29,25 @@ static inline uns Ucategory(uns x)
     return 0;
 }
 
-static inline uns Utoupper(uns x)
+static inline uint Utoupper(uint x)
 {
-  uns w = (_U_upper[x >> 8U]) ? _U_upper[x >> 8U][x & 0xff] : 0;
+  uint w = (_U_upper[x >> 8U]) ? _U_upper[x >> 8U][x & 0xff] : 0;
   return w ? w : x;
 }
 
-static inline uns Utolower(uns x)
+static inline uint Utolower(uint x)
 {
-  uns w = (_U_lower[x >> 8U]) ? _U_lower[x >> 8U][x & 0xff] : 0;
+  uint w = (_U_lower[x >> 8U]) ? _U_lower[x >> 8U][x & 0xff] : 0;
   return w ? w : x;
 }
 
-static inline uns Uunaccent(uns x)
+static inline uint Uunaccent(uint x)
 {
-  uns w = (_U_unaccent[x >> 8U]) ? _U_unaccent[x >> 8U][x & 0xff] : 0;
+  uint w = (_U_unaccent[x >> 8U]) ? _U_unaccent[x >> 8U][x & 0xff] : 0;
   return w ? w : x;
 }
 
-extern const u16 *Uexpand_lig(uns x);
+extern const u16 *Uexpand_lig(uint x);
 
 enum unicode_char_type {
   _U_LETTER = 1,               /* Letters */