ABI: Tables used by ucw/chartype.h are prefixed

diff --git a/ucw/char-cat.c b/ucw/char-cat.c
index e9b148044d2d8ebd08f2019fac1f96396b5f4131..9ca8e75d9ef892675512f1672d70b054c264d8bd 100644 (file)
--- a/ucw/char-cat.c
+++ b/ucw/char-cat.c
@@ -10,7 +10,7 @@
 #include <ucw/lib.h>
 #include <ucw/chartype.h>
 
-const byte _c_cat[256] = {
+const byte ucw_c_cat[256] = {
 #define CHAR(code,upper,lower,cat) cat,
 #include <ucw/char-map.h>
 #undef CHAR

diff --git a/ucw/char-lower.c b/ucw/char-lower.c
index cc6f99eb73bd8bbc2681de53842b2f30a6670bc3..db97583f56602c796b45d08adcf22d1be620f00c 100644 (file)
--- a/ucw/char-lower.c
+++ b/ucw/char-lower.c
@@ -10,7 +10,7 @@
 #include <ucw/lib.h>
 #include <ucw/chartype.h>
 
-const byte _c_lower[256] = {
+const byte ucw_c_lower[256] = {
 #define CHAR(code,upper,lower,cat) lower,
 #include <ucw/char-map.h>
 #undef CHAR

diff --git a/ucw/char-upper.c b/ucw/char-upper.c
index 69a0320b2046999e69075fa752c229874aed03f9..c56528cbd30a3c138b46f14d5e568d26b4f31bb8 100644 (file)
--- a/ucw/char-upper.c
+++ b/ucw/char-upper.c
@@ -10,7 +10,7 @@
 #include <ucw/lib.h>
 #include <ucw/chartype.h>
 
-const byte _c_upper[256] = {
+const byte ucw_c_upper[256] = {
 #define CHAR(code,upper,lower,cat) upper,
 #include <ucw/char-map.h>
 #undef CHAR

diff --git a/ucw/chartype.h b/ucw/chartype.h
index 055b540ac9168ea6f8be1b1bd1a12eb17bebf8f2..09b41839324e959f154f1975b51fa007ec7737d7 100644 (file)
--- 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).