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, 5 insertions, 3 deletions

diff --git a/common.h b/common.h
index 832883cd..7932c870 100644
--- a/common.h
+++ b/common.h
@@ -713,11 +713,13 @@ const wchar_t *wcsfuncname(const wchar_t *str);
 
 bool wcsvarchr(wchar_t chr);
 
-
 /**
-   A wcswidth workalike. Fish uses this since the regular wcswidth seems flaky.
+   Convenience variants on fish_wcwswidth().
+
+   See fallback.h for the normal definitions.
 */
-int my_wcswidth(const wchar_t *c);
+int fish_wcswidth(const wchar_t *str);
+int fish_wcswidth(const wcstring& str);
 
 /**
    This functions returns the end of the quoted substring beginning at