Commit 735cc9d7 authored by unknown's avatar unknown

Fix for windows specific errors

parent a5f01a1a
...@@ -32,7 +32,7 @@ extern "C" { ...@@ -32,7 +32,7 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
enum enum_vio_type { VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET, enum enum_vio_type { VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET,
VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL }; VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL, VIO_TYPE_SHARED_MEMORY };
#ifndef __WIN__ #ifndef __WIN__
#define HANDLE void * #define HANDLE void *
......
...@@ -3193,7 +3193,7 @@ static int sort_ft_key_write(MI_SORT_PARAM *sort_param, const void *a) ...@@ -3193,7 +3193,7 @@ static int sort_ft_key_write(MI_SORT_PARAM *sort_param, const void *a)
} }
/* storing the key in the buffer. */ /* storing the key in the buffer. */
memcpy (ft_buf->buf, a+val_off, val_len); memcpy (ft_buf->buf, (char *)a+val_off, val_len);
ft_buf->buf+=val_len; ft_buf->buf+=val_len;
if (ft_buf->buf < ft_buf->end) if (ft_buf->buf < ft_buf->end)
return 0; return 0;
......
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