X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fchartype.h;h=09b41839324e959f154f1975b51fa007ec7737d7;hb=0db6e10eac28f38bfc3b325b13ad95107c58ce1e;hp=055b540ac9168ea6f8be1b1bd1a12eb17bebf8f2;hpb=1cf8ac51f5495ccd5187dc220ffc69e95d6e0cfc;p=libucw.git diff --git a/ucw/chartype.h b/ucw/chartype.h index 055b540a..09b41839 100644 --- a/ucw/chartype.h +++ b/ucw/chartype.h @@ -33,9 +33,9 @@ #define _C_WORD (_C_ALNUM | _C_INNER) #define _C_WSTART (_C_ALPHA | _C_INNER) -extern const byte _c_cat[256], _c_upper[256], _c_lower[256]; +extern const byte ucw_c_cat[256], ucw_c_upper[256], ucw_c_lower[256]; -#define Category(x) (_c_cat[(byte)(x)]) +#define Category(x) (ucw_c_cat[(byte)(x)]) #define Ccat(x,y) (Category(x) & y) #define Cupper(x) Ccat(x, _C_UPPER) /** Checks for an upper-case character (`A-Z`). **/ @@ -50,8 +50,8 @@ extern const byte _c_cat[256], _c_upper[256], _c_lower[256]; #define Cctrl(x) Ccat(x, _C_CTRL) /** Checks for control characters (`0x0-0x1F`, `0x7F`). **/ #define Cspace(x) Cblank(x) -#define Cupcase(x) (_c_upper[(byte)(x)]) /** Convert a letter to upper case, leave non-letter characters unchanged. **/ -#define Clocase(x) (_c_lower[(byte)(x)]) /** Convert a letter to lower case, leave non-letter characters unchanged. **/ +#define Cupcase(x) (ucw_c_upper[(byte)(x)]) /** Convert a letter to upper case, leave non-letter characters unchanged. **/ +#define Clocase(x) (ucw_c_lower[(byte)(x)]) /** Convert a letter to lower case, leave non-letter characters unchanged. **/ /** * Compute the value of a valid hexadecimal character (ie. passed the @Cxdigit() check).