mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 03:47:17 +02:00
Portability fixes for Windows
VC++Files/client/mysqlclient.dsp: Update for windows VC++Files/libmysql/libmysql.dsp: Update for windows VC++Files/strings/strings.dsp: Update for windows libmysqld/lib_sql.cc: Update for windows scripts/make_win_src_distribution.sh: Update for windows scripts/mysql_install_db.sh: Update for windows sql/mysqld.cc: Remove not used variable sql/set_var.cc: Indentation cleanups sql/share/czech/errmsg.txt: Fixed wrong delimiters sql/share/danish/errmsg.txt: Fixed wrong delimiters sql/share/dutch/errmsg.txt: Fixed wrong delimiters sql/share/english/errmsg.txt: Fixed wrong delimiters sql/share/estonian/errmsg.txt: Fixed wrong delimiters sql/share/french/errmsg.txt: Fixed wrong delimiters sql/share/greek/errmsg.txt: Fixed wrong delimiters sql/share/hungarian/errmsg.txt: Fixed wrong delimiters sql/share/italian/errmsg.txt: Fixed wrong delimiters sql/share/japanese/errmsg.txt: Fixed wrong delimiters sql/share/korean/errmsg.txt: Fixed wrong delimiters sql/share/norwegian-ny/errmsg.txt: Fixed wrong delimiters sql/share/norwegian/errmsg.txt: Fixed wrong delimiters sql/share/polish/errmsg.txt: Fixed wrong delimiters sql/share/portuguese/errmsg.txt: Fixed wrong delimiters sql/share/romanian/errmsg.txt: Fixed wrong delimiters sql/share/russian/errmsg.txt: Fixed wrong delimiters sql/share/serbian/errmsg.txt: Fixed wrong delimiters sql/share/slovak/errmsg.txt: Fixed wrong delimiters sql/share/spanish/errmsg.txt: Fixed wrong delimiters sql/share/swedish/errmsg.txt: Fixed wrong delimiters sql/share/ukrainian/errmsg.txt: Fixed wrong delimiters sql/sql_acl.cc: Removed compiler warnings strings/ctype-big5.c: Removed compiler warnings (VC++) strings/ctype-euc_kr.c: Removed compiler warnings (VC++) strings/ctype-gb2312.c: Removed compiler warnings (VC++) strings/ctype-gbk.c: Removed compiler warnings (VC++) strings/ctype-sjis.c: Removed compiler warnings (VC++) strings/ctype-ucs2.c: Removed compiler warnings (VC++) strings/ctype-ujis.c: Removed compiler warnings (VC++)
This commit is contained in:
parent
580d754da6
commit
e505696ffc
38 changed files with 193 additions and 149 deletions
|
|
@ -6183,16 +6183,16 @@ my_wc_mb_big5(CHARSET_INFO *cs __attribute__((unused)),
|
|||
if (s >= e)
|
||||
return MY_CS_TOOSMALL;
|
||||
|
||||
if(wc<0x80)
|
||||
if ((int) wc < 0x80)
|
||||
{
|
||||
s[0]=wc;
|
||||
s[0]= (uchar) wc;
|
||||
return 1;
|
||||
}
|
||||
|
||||
if(!(code=func_uni_big5_onechar(wc)))
|
||||
if (!(code=func_uni_big5_onechar(wc)))
|
||||
return MY_CS_ILUNI;
|
||||
|
||||
if(s+2>e)
|
||||
if (s+2>e)
|
||||
return MY_CS_TOOSMALL;
|
||||
|
||||
s[0]=code>>8;
|
||||
|
|
@ -6201,6 +6201,7 @@ my_wc_mb_big5(CHARSET_INFO *cs __attribute__((unused)),
|
|||
return 2;
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
my_mb_wc_big5(CHARSET_INFO *cs __attribute__((unused)),
|
||||
my_wc_t *pwc,const uchar *s,const uchar *e)
|
||||
|
|
@ -6211,16 +6212,16 @@ my_mb_wc_big5(CHARSET_INFO *cs __attribute__((unused)),
|
|||
if (s >= e)
|
||||
return MY_CS_TOOFEW(0);
|
||||
|
||||
if(hi<0x80)
|
||||
if (hi<0x80)
|
||||
{
|
||||
pwc[0]=hi;
|
||||
return 1;
|
||||
}
|
||||
|
||||
if(s+2>e)
|
||||
if (s+2>e)
|
||||
return MY_CS_TOOFEW(0);
|
||||
|
||||
if(!(pwc[0]=func_big5_uni_onechar((hi<<8)+s[1])))
|
||||
if (!(pwc[0]=func_big5_uni_onechar((hi<<8)+s[1])))
|
||||
return MY_CS_ILSEQ;
|
||||
|
||||
return 2;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue