diff options
author | unknown <knielsen@knielsen-hq.org> | 2009-09-15 14:12:51 +0200 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2009-09-15 14:12:51 +0200 |
commit | 2a4c97fc3eb90c49f81219183dd6d9b998df3077 (patch) | |
tree | a6b1bc74538540131a415155302fd9dedd4cce61 /cmd-line-utils | |
parent | 85c97f96c0afc2f311ac311309975f6d806a9f44 (diff) | |
parent | 71f4bfd6c7dba0ea4b00469d48e458f0e5eeaf67 (diff) | |
download | mariadb-git-2a4c97fc3eb90c49f81219183dd6d9b998df3077.tar.gz |
MySQL 5.1.38 merge into MariaDB.
Merge remaining bits of mysql-5.1.38 into MariaDB (9 commits were missing
from the original merge).
Diffstat (limited to 'cmd-line-utils')
-rw-r--r-- | cmd-line-utils/readline/util.c | 9 |
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; |