database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Windows portabilty fixups (last commit caused some errors, so recomitting) - SCRUM

Browse Source 
strings/strto.c:
  Windows won't compile for a wrong argument passing, expects a charset pointer
sql/filesort.cc:
  Remove unused variable
sql/lex.h:
  Change POINT->POINT_SYM due to redefination error from windef.h
sql/mysqld.cc:
  Fix Embedded Server related code
sql/protocol.cc:
  Remove unused variables from Embedded Server
sql/sql_class.h:
  Remove silly usage
sql/sql_derived.cc:
  Windows won't let you compile for this kind of assignments
sql/sql_help.cc:
  Need a cast to make it compile
sql/sql_parse.cc:
  Remove unused variables from Embedded server
sql/sql_yacc.yy:
  Change POINT->POINT_SYM due to redefination error from windef.h
mysys/mf_keycache.c:
  Add a correct cast and remove the unused variables
libmysqld/lib_sql.cc:
  Remove unused variable
libmysqld/libmysqld.c:
  Port the netware change to remove mysql_once_init to libmysqld
This commit is contained in:
unknown
2003-02-20 14:14:37 -08:00
parent 6963b121da
commit 20e237e5eb
13 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
strings/strto.c
View File

@ -95,7 +95,7 @@ function (const char *nptr,char **endptr,int base)
s = nptr;
/* Skip white space. */
while (my_isspace (my_charset_latin1, *s))
while (my_isspace (&my_charset_latin1, *s))
++s;
if (*s == '\0')
{
@ -115,7 +115,7 @@ function (const char *nptr,char **endptr,int base)
}
if (base == 16 && s[0] == '0' && my_toupper (my_charset_latin1, s[1]) == 'X')
if (base == 16 && s[0] == '0' && my_toupper (&my_charset_latin1, s[1]) == 'X')
s += 2;
/* If BASE is zero, figure it out ourselves. */
@ -123,7 +123,7 @@ function (const char *nptr,char **endptr,int base)
{
if (*s == '0')
{
if (my_toupper (my_charset_latin1, s[1]) == 'X')
if (my_toupper (&my_charset_latin1, s[1]) == 'X')
{
s += 2;
base = 16;
@ -145,10 +145,10 @@ function (const char *nptr,char **endptr,int base)
i = 0;
for (c = *s; c != '\0'; c = *++s)
{
if (my_isdigit (my_charset_latin1, c))
if (my_isdigit (&my_charset_latin1, c))
c -= '0';
else if (my_isalpha (my_charset_latin1, c))
c = my_toupper (my_charset_latin1, c) - 'A' + 10;
else if (my_isalpha (&my_charset_latin1, c))
c = my_toupper (&my_charset_latin1, c) - 'A' + 10;
else
break;
if (c >= base)