X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Funicat.h;h=78f99eb4bf9c6238e02e0a5e5f62bde1f87ad589;hb=1bc3bb66e47ec02003658fb3040aef0ffd7b7540;hp=bb0cf889e593f9d4ac0faddc10e4a2c249a96ca8;hpb=a4f8b029b86d2ca1612a9c2e2795ccea27b15276;p=libucw.git diff --git a/charset/unicat.h b/charset/unicat.h index bb0cf889..78f99eb4 100644 --- a/charset/unicat.h +++ b/charset/unicat.h @@ -21,7 +21,7 @@ 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]; @@ -29,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 */