diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-06-29 15:17:01 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-06-29 15:17:01 +0200 |
| commit | 67771508836edda4bad393f1a00d89cd419e3814 (patch) | |
| tree | c3d2d1b1efe2de7e702c3d65d8b7bddccbdbd5d0 /cmd-line-utils/readline/nls.c | |
| parent | 729648c4b776ec4992f6333f0c70b4b749e8d996 (diff) | |
| download | mariadb-git-67771508836edda4bad393f1a00d89cd419e3814.tar.gz | |
Merge from 5.0-bt
Diffstat (limited to 'cmd-line-utils/readline/nls.c')
| -rw-r--r-- | cmd-line-utils/readline/nls.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmd-line-utils/readline/nls.c b/cmd-line-utils/readline/nls.c index 6ec685ed9ea..ff40b14228c 100644 --- a/cmd-line-utils/readline/nls.c +++ b/cmd-line-utils/readline/nls.c @@ -101,7 +101,8 @@ _rl_init_eightbit () /* If we have setlocale(3), just check the current LC_CTYPE category value, and go into eight-bit mode if it's not C or POSIX. */ #if defined (HAVE_SETLOCALE) - char *lspec, *t; + const char *lspec; + char *t; /* Set the LC_CTYPE locale category from environment variables. */ lspec = _rl_get_locale_var ("LC_CTYPE"); @@ -127,7 +128,8 @@ _rl_init_eightbit () return (0); #else /* !HAVE_SETLOCALE */ - char *lspec, *t; + const char *lspec; + char *t; int i; /* We don't have setlocale. Finesse it. Check the environment for the |