Remove my_wcswidth() in favor of fish_wcswidth()

my_wcswidth() was just a wrapper around fish_wcswidth() already.
Instead, add two convenience overrides of fish_wcswidth() to common.h
that make it a drop-in replacement for my_wcswidth().

1 files changed, 2 insertions, 2 deletions

diff --git a/output.cpp b/output.cpp
index 312a9077..2c9f7d48 100644
--- a/output.cpp
+++ b/output.cpp
@@ -535,7 +535,7 @@ void writestr_ellipsis(const wchar_t *str, int max_width)
 
     CHECK(str,);
 
-    tot = my_wcswidth(str);
+    tot = fish_wcswidth(str);
 
     if (tot <= max_width)
     {
@@ -575,7 +575,7 @@ int write_escaped_str(const wchar_t *str, int max_len)
     CHECK(str, 0);
 
     out = escape(str, 1);
-    len = my_wcswidth(out);
+    len = fish_wcswidth(out);
 
     if (max_len && (max_len < len))
     {