Bump to autoconf 2.69 and automake 1.15.1

[deliverable/binutils-gdb.git] / readline / mbutil.c

diff --git a/readline/mbutil.c b/readline/mbutil.c
index b036e0c3264fc71b7c5572d80c4b2e4c848df6ad..eeb7e557f64a9b7bafc6ed46730560028281a339 100644 (file)
--- a/readline/mbutil.c
+++ b/readline/mbutil.c
@@ -64,9 +64,6 @@ int rl_byte_oriented = 0;
 int rl_byte_oriented = 1;
 #endif
 
-/* Ditto */
-int _rl_utf8locale = 0;
-
 /* **************************************************************** */
 /*                                                                 */
 /*             Multibyte Character Utility Functions               */
@@ -122,7 +119,7 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero)
          point += tmp;
          if (find_non_zero)
            {
-             if (WCWIDTH (wc) == 0)
+             if (wcwidth (wc) == 0)
                continue;
              else
                count--;
@@ -135,7 +132,7 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero)
   if (find_non_zero)
     {
       tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
-      while (MB_NULLWCH (tmp) == 0 && MB_INVALIDCH (tmp) == 0 && WCWIDTH (wc) == 0)
+      while (MB_NULLWCH (tmp) == 0 && MB_INVALIDCH (tmp) == 0 && wcwidth (wc) == 0)
        {
          point += tmp;
          tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
@@ -187,7 +184,7 @@ _rl_find_prev_mbchar_internal (string, seed, find_non_zero)
        {
          if (find_non_zero)
            {
-             if (WCWIDTH (wc) != 0)
+             if (wcwidth (wc) != 0)
                prev = point;
            }
          else
@@ -266,7 +263,7 @@ _rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2)
    if point is invalied (point < 0 || more than string length),
    it returns -1 */
 int
-_rl_adjust_point (string, point, ps)
+_rl_adjust_point(string, point, ps)
      char *string;
      int point;
      mbstate_t *ps;