From 95e0a07f891947c5c2d66cd837a5aa379b962308 Mon Sep 17 00:00:00 2001 From: "Avi Halachmi (:avih)" Date: Fri, 29 Mar 2024 17:32:57 +0300 Subject: Revert "unicode: identify emoji width and modifiers" This reverts commit 878b3cd27fe83f2b0ff476b884c34d165be0072c. It's no longer required, since the last commit uses a new wcwidth implementation which covers the cases added by commit 878b3cd2 . --- libbb/unicode.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libbb/unicode.c b/libbb/unicode.c index a0b2db625..22e45878a 100644 --- a/libbb/unicode.c +++ b/libbb/unicode.c @@ -660,9 +660,6 @@ int FAST_FUNC wcwidth(unsigned ucs) { 0x0A38, 0x0A3A }, { 0x0A3F, 0x0A3F }, { 0xD167, 0xD169 }, { 0xD173, 0xD182 }, { 0xD185, 0xD18B }, { 0xD1AA, 0xD1AD }, { 0xD242, 0xD244 } -#if ENABLE_PLATFORM_MINGW32 - , { 0xF3FB, 0xF3FF } -#endif }; /* Binary search in table of non-spacing characters in Supplementary Multilingual Plane */ if (in_interval_table(ucs ^ 0x10000, combining0x10000, ARRAY_SIZE(combining0x10000) - 1)) @@ -699,11 +696,6 @@ int FAST_FUNC wcwidth(unsigned ucs) || (ucs >= 0xff00 && ucs <= 0xff60) /* Fullwidth Forms */ || (ucs >= 0xffe0 && ucs <= 0xffe6) # endif -#if ENABLE_PLATFORM_MINGW32 -# if CONFIG_LAST_SUPPORTED_WCHAR >= 0x10000 - || (ucs >= 0x1f600 && ucs <= 0x1f64f) /* Emoticons */ -# endif -#endif # if CONFIG_LAST_SUPPORTED_WCHAR >= 0x20000 || ((ucs >> 17) == (2 >> 1)) /* 20000..3ffff: Supplementary and Tertiary Ideographic Planes */ # endif -- cgit v1.2.3-55-g6feb