summaryrefslogtreecommitdiff
path: root/cmd-line-utils
diff options
context:
space:
mode:
authorJonathan Perkin <jperkin@sun.com>2009-09-03 01:48:06 +0200
committerJonathan Perkin <jperkin@sun.com>2009-09-03 01:48:06 +0200
commit0644b0acfa43206cd87270557b041f921fa92f02 (patch)
treeb01af07a6a5a0b7f510e606c065e77952a6c015a /cmd-line-utils
parent41427950ed8bf62628d99936686d1f2db0528336 (diff)
parent71f4bfd6c7dba0ea4b00469d48e458f0e5eeaf67 (diff)
downloadmariadb-git-0644b0acfa43206cd87270557b041f921fa92f02.tar.gz
Merge from mysql-5.1.38-release
Diffstat (limited to 'cmd-line-utils')
-rw-r--r--cmd-line-utils/readline/util.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/cmd-line-utils/readline/util.c b/cmd-line-utils/readline/util.c
index 50cfea75cb9..342224facd7 100644
--- a/cmd-line-utils/readline/util.c
+++ b/cmd-line-utils/readline/util.c
@@ -81,8 +81,13 @@ rl_alphabetic (c)
#if defined (HANDLE_MULTIBYTE)
int
-_rl_walphabetic (wc)
- wchar_t wc;
+/*
+ Portability issue with VisualAge C++ Professional / C for AIX Compiler, Version 6:
+ "util.c", line 84.1: 1506-343 (S) Redeclaration of _rl_walphabetic differs
+ from previous declaration on line 110 of "rlmbutil.h".
+ So, put type in the function signature here.
+*/
+_rl_walphabetic (wchar_t wc)
{
int c;