Remove dependency on LEVELS()

Closes #1726
r-lib · Jul 2, 2024 · a4bbdf2 · a4bbdf2
1 parent 6f102ce
commit a4bbdf2
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/internal/encoding.c b/src/internal/encoding.c
@@ -189,9 +189,10 @@ bool str_needs_encoding(r_obj* x) {
   return (!str_is_ascii_or_utf8(x)) && (x != NA_STRING);
 }
 
+#if (R_VERSION < R_Version(4, 5, 0))
+
 #define MASK_ASCII 8
 #define MASK_UTF8 64
-
 // The first 128 values are ASCII, and are the same regardless of the encoding.
 // Otherwise we enforce UTF-8.
 static inline
@@ -200,5 +201,11 @@ bool str_is_ascii_or_utf8(r_obj* x) {
   return (levels & MASK_ASCII) || (levels & MASK_UTF8);
 }
 
-#undef MASK_ASCII
-#undef MASK_UTF8
+#else
+
+static inline
+bool str_is_ascii_or_utf8(r_obj* x) {
+  return Rf_charIsUTF8(x);
+}
+
+#endif