X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Funicat.h;h=bb0cf889e593f9d4ac0faddc10e4a2c249a96ca8;hb=d9c55a4d021b4a317a25f14f89468d62592aae0b;hp=021ec5c2eb4106b950fa257fc2bf2ca62d7867fc;hpb=47a0795e8a28e8ad6ff55cda89e300267d9e590c;p=libucw.git diff --git a/charset/unicat.h b/charset/unicat.h index 021ec5c2..bb0cf889 100644 --- a/charset/unicat.h +++ b/charset/unicat.h @@ -10,8 +10,16 @@ #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 word *_U_upper[], *_U_lower[], *_U_unaccent[]; +extern const u16 *_U_upper[], *_U_lower[], *_U_unaccent[]; static inline uns Ucategory(uns x) { @@ -23,23 +31,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 */