Merge branch 'wt/namespace' into api-hardening

1 files changed, 15 insertions, 15 deletions

diff --git a/include/term/unicode/width.h b/include/term/unicode/width.h
index a7dfe66..a85ec77 100644
--- a/include/term/unicode/width.h
+++ b/include/term/unicode/width.h
@@ -5,15 +5,15 @@
 #include <stddef.h>
 #include <stdint.h>
 
-struct unicode_range { uint32_t lo, hi; };
+struct term_unicode_range { uint32_t lo, hi; };
 
 #include "unicode_data.inc"
 
-static inline bool in_ranges(const struct unicode_range *ranges, size_t count, uint32_t cp)
+static inline bool term_in_ranges(const struct term_unicode_range *ranges, size_t count, uint32_t cp)
 {
     if (count == 0 || cp < ranges[0].lo || cp > ranges[count - 1].hi)
         return false;
-    const struct unicode_range *base = ranges;
+    const struct term_unicode_range *base = ranges;
     size_t n = count;
     while (n > 1) {
         size_t half = n / 2;
@@ -23,34 +23,34 @@ static inline bool in_ranges(const struct unicode_range *ranges, size_t count, u
     return cp <= base->hi;
 }
 
-#define IN_TABLE(table, cp) in_ranges(table, sizeof(table) / sizeof(table[0]), cp)
+#define TERM_IN_TABLE(table, cp) term_in_ranges(table, sizeof(table) / sizeof(table[0]), cp)
 
-static inline int unicode_width(uint32_t cp)
+static inline int term_unicode_width(uint32_t cp)
 {
-    if (cp > 0x10FFFF || IN_TABLE(nonprintable, cp))
+    if (cp > 0x10FFFF || TERM_IN_TABLE(term_nonprintable, cp))
         return -1;
-    if (IN_TABLE(zero_width, cp))
+    if (TERM_IN_TABLE(term_zero_width, cp))
         return 0;
-    return IN_TABLE(unicode_wide, cp) ? 2 : 1;
+    return TERM_IN_TABLE(term_unicode_wide, cp) ? 2 : 1;
 }
 
-static inline bool unicode_extended_pictographic(uint32_t cp)
+static inline bool term_unicode_extended_pictographic(uint32_t cp)
 {
-    return IN_TABLE(extended_pictographic, cp);
+    return TERM_IN_TABLE(term_extended_pictographic, cp);
 }
 
-static inline bool unicode_emoji_presentation(uint32_t cp)
+static inline bool term_unicode_emoji_presentation(uint32_t cp)
 {
-    return IN_TABLE(emoji_presentation, cp);
+    return TERM_IN_TABLE(term_emoji_presentation, cp);
 }
 
-static inline bool unicode_spacing_mark(uint32_t cp)
+static inline bool term_unicode_spacing_mark(uint32_t cp)
 {
     if (cp < 0x903 || ((cp - 0xABEDu) < (0x11000u - 0xABEDu)) || cp > 0x1D281)
         return false;
-    return IN_TABLE(spacing_mark, cp);
+    return TERM_IN_TABLE(term_spacing_mark, cp);
 }
 
-#undef IN_TABLE
+#undef TERM_IN_TABLE
 
 #endif