1 files changed, 8 insertions, 0 deletions

diff --git a/libbb/unicode.c b/libbb/unicode.c
index 638c3b7c3..206ec0dcb 100644
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -659,6 +659,9 @@ 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))
@@ -695,6 +698,11 @@ 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