mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed build failure on OpenSolaris

Browse source 
strings/ctype-simple.c:
  Fixed some compiler warnings
This commit is contained in:
Michael Widenius 2011-06-09 11:13:03 +03:00
parent 8d7f810894
commit 163d7acc9f
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp
View file

@ -6,6 +6,7 @@
* See COPYRIGHT.txt for details. * See COPYRIGHT.txt for details.
*/ */
#include <my_config.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <errno.h> #include <errno.h>
#include <poll.h> #include <poll.h>
@ -17,6 +18,9 @@
#if __linux__ #if __linux__
#include <sys/epoll.h> #include <sys/epoll.h>
#endif #endif
#ifdef HAVE_ALLOCA_H
#include <alloca.h>
#endif
#include "hstcpsvr_worker.hpp" #include "hstcpsvr_worker.hpp"
#include "string_buffer.hpp" #include "string_buffer.hpp"

4
strings/ctype-simple.c
View file

@ -1545,7 +1545,7 @@ my_strntoull10rnd_8bit(CHARSET_INFO *cs __attribute__((unused)),
} }
} }
digits= str - beg; digits= (int) (str - beg);
/* Continue to accumulate into ulonglong */ /* Continue to accumulate into ulonglong */
for (dot= NULL, ull= ul; str < end; str++) for (dot= NULL, ull= ul; str < end; str++)
@ -1582,7 +1582,7 @@ my_strntoull10rnd_8bit(CHARSET_INFO *cs __attribute__((unused)),
} }
else else
{ {
shift= dot - str; shift= (int) (dot - str);
for ( ; str < end && (ch= (uchar) (*str - '0')) < 10; str++); for ( ; str < end && (ch= (uchar) (*str - '0')) < 10; str++);
} }
goto exp; goto exp;