fix for l10nflist.c?

[Jack Howarth]

    The following changes eliminate the warnings when
l10nflist.c is compiled...

--- /Users/howarth/gcc/intl/l10nflist.c 2006-08-13 14:29:20.000000000 -0400
+++ l10nflist.c 2006-09-30 17:24:19.000000000 -0400
@@ -139,12 +139,12 @@
 #endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
 
 #if !defined _LIBC && !defined HAVE___ARGZ_NEXT
-static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
+static char *argz_next__ PARAMS ((const char *argz, size_t argz_len,
                                  const char *entry));
 
 static char *
 argz_next__ (argz, argz_len, entry)
-     char *argz;
+     const char *argz;
      size_t argz_len;
      const char *entry;
 {
@@ -157,7 +157,7 @@
     }
   else
     if (argz_len > 0)
-      return argz;
+      return (char *) argz;
     else
       return 0;
 }
@@ -368,7 +368,7 @@
            /* Iterate over all elements of the DIRLIST.  */
            char *dir = NULL;
 
-           while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
+           while ((dir = __argz_next ((const char *) dirlist, dirlist_len, 
dir))
                   != NULL)
              retval->successor[entries++]
                = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1,

Does this look like the correct approach?
              Jack