From: Martin Mares Date: Fri, 3 Jan 2014 14:59:07 +0000 (+0100) Subject: ABI: Tables used by ucw/chartype.h are prefixed X-Git-Tag: v5.99~50^2~8 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=be141e60a70c2a080263070cb3458d24821ff908;p=libucw.git ABI: Tables used by ucw/chartype.h are prefixed --- diff --git a/ucw/char-cat.c b/ucw/char-cat.c index e9b14804..9ca8e75d 100644 --- a/ucw/char-cat.c +++ b/ucw/char-cat.c @@ -10,7 +10,7 @@ #include #include -const byte _c_cat[256] = { +const byte ucw_c_cat[256] = { #define CHAR(code,upper,lower,cat) cat, #include #undef CHAR diff --git a/ucw/char-lower.c b/ucw/char-lower.c index cc6f99eb..db97583f 100644 --- a/ucw/char-lower.c +++ b/ucw/char-lower.c @@ -10,7 +10,7 @@ #include #include -const byte _c_lower[256] = { +const byte ucw_c_lower[256] = { #define CHAR(code,upper,lower,cat) lower, #include #undef CHAR diff --git a/ucw/char-upper.c b/ucw/char-upper.c index 69a0320b..c56528cb 100644 --- a/ucw/char-upper.c +++ b/ucw/char-upper.c @@ -10,7 +10,7 @@ #include #include -const byte _c_upper[256] = { +const byte ucw_c_upper[256] = { #define CHAR(code,upper,lower,cat) upper, #include #undef CHAR 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).