diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2010-02-22 14:23:47 +0100 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2010-02-22 14:23:47 +0100 |
| commit | 57a40848848274a83313f0d57bb184307e0ff87b (patch) | |
| tree | 562de7e644892982f4ad885d065ea71e60181fc2 /cmd-line-utils | |
| parent | 7d8bed112c7ddb59b134102f36999dedce370823 (diff) | |
| download | mariadb-git-57a40848848274a83313f0d57bb184307e0ff87b.tar.gz | |
Bug #43414 Parenthesis (and other) warnings compiling
MySQL with gcc 4.3.2
This is the final patch in the context of this bug.
cmd-line-utils/readline/rlmbutil.h:
Changed in a previous patch, reverted by a backport.
cmd-line-utils/readline/text.c:
Static var initialization.
extra/yassl/include/yassl_error.hpp:
SetErrorString handles errors outside of the YasslError
enum.
extra/yassl/src/ssl.cpp:
SetErrorString handles errors outside of the YasslError
enum.
extra/yassl/src/yassl_error.cpp:
SetErrorString handles errors outside of the YasslError
enum.
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/readline/rlmbutil.h | 4 | ||||
| -rw-r--r-- | cmd-line-utils/readline/text.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd-line-utils/readline/rlmbutil.h b/cmd-line-utils/readline/rlmbutil.h index dd317e2a090..6ca8fdde92b 100644 --- a/cmd-line-utils/readline/rlmbutil.h +++ b/cmd-line-utils/readline/rlmbutil.h @@ -109,8 +109,8 @@ extern int _rl_is_mbchar_matched PARAMS((char *, int, int, char *, int)); extern wchar_t _rl_char_value PARAMS((char *, int)); extern int _rl_walphabetic PARAMS((wchar_t)); -#define _rl_to_wupper(wc) (iswlower (wc) ? towupper (wc) : (wc)) -#define _rl_to_wlower(wc) (iswupper (wc) ? towlower (wc) : (wc)) +#define _rl_to_wupper(wc) (iswlower (wc) ? (wchar_t)towupper (wc) : (wc)) +#define _rl_to_wlower(wc) (iswupper (wc) ? (wchar_t)towlower (wc) : (wc)) #define MB_NEXTCHAR(b,s,c,f) \ ((MB_CUR_MAX > 1 && rl_byte_oriented == 0) \ diff --git a/cmd-line-utils/readline/text.c b/cmd-line-utils/readline/text.c index 272848c798c..bb0f5d97160 100644 --- a/cmd-line-utils/readline/text.c +++ b/cmd-line-utils/readline/text.c @@ -614,7 +614,7 @@ rl_arrow_keys (count, c) #ifdef HANDLE_MULTIBYTE static char pending_bytes[MB_LEN_MAX]; static int pending_bytes_length = 0; -static mbstate_t ps = {0}; +static mbstate_t ps; #endif /* Insert the character C at the current location, moving point forward. |