Commit 163d7acc authored by Michael Widenius's avatar Michael Widenius

Fixed build failure on OpenSolaris

strings/ctype-simple.c:
  Fixed some compiler warnings
parent 8d7f8108
...@@ -6,6 +6,7 @@ ...@@ -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 @@ ...@@ -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"
......
...@@ -1545,7 +1545,7 @@ my_strntoull10rnd_8bit(CHARSET_INFO *cs __attribute__((unused)), ...@@ -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)), ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment