diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-14 17:23:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-14 17:23:34 +0300 |
| commit | 60589aeee03949033c66da5c1eae70d4342179fc (patch) | |
| tree | 1cd399dbed17c5c7b4ed16eb7b872dc979af1c93 /vio/vio_priv.h | |
| parent | b39e6e3d093b45f792959ef06fea1c175263ae1a (diff) | |
| download | mariadb-git-60589aeee03949033c66da5c1eae70d4342179fc.tar.gz | |
Next part of merge. See TODO for details
Diffstat (limited to 'vio/vio_priv.h')
| -rw-r--r-- | vio/vio_priv.h | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/vio/vio_priv.h b/vio/vio_priv.h index 61a8ab150a9..c1dc090a106 100644 --- a/vio/vio_priv.h +++ b/vio/vio_priv.h @@ -1,7 +1,4 @@ -#ifndef VIO_PRIV_INCLUDED -#define VIO_PRIV_INCLUDED - -/* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2003, 2011, Oracle and/or its affiliates. Copyright (c) 2012, Monty Program Ab This program is free software; you can redistribute it and/or modify @@ -17,6 +14,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef VIO_PRIV_INCLUDED +#define VIO_PRIV_INCLUDED + /* Structures and functions private to the vio package */ #define DONT_MAP_VIO @@ -26,16 +26,7 @@ #include <m_string.h> #include <violite.h> -#ifndef __WIN__ -#include <sys/socket.h> -#include <netdb.h> -#endif - #ifdef _WIN32 -void vio_win32_timeout(Vio *vio, uint which, uint timeout); -#endif - -#ifdef __WIN__ size_t vio_read_pipe(Vio *vio, uchar * buf, size_t size); size_t vio_write_pipe(Vio *vio, const uchar * buf, size_t size); my_bool vio_is_connected_pipe(Vio *vio); @@ -53,9 +44,10 @@ my_bool vio_shared_memory_has_data(Vio *vio); int vio_shutdown_shared_memory(Vio *vio, int how); #endif -int vio_socket_shutdown(Vio *vio, int how); -void vio_timeout(Vio *vio,uint which, uint timeout); -my_bool vio_buff_has_data(Vio *vio); +int vio_socket_shutdown(Vio *vio, int how); +my_bool vio_buff_has_data(Vio *vio); +int vio_socket_io_wait(Vio *vio, enum enum_vio_io_event event); +int vio_socket_timeout(Vio *vio, uint which, my_bool old_mode); #ifdef HAVE_OPENSSL #include "my_net.h" /* needed because of struct in_addr */ @@ -66,9 +58,6 @@ size_t vio_ssl_write(Vio *vio,const uchar* buf, size_t size); /* When the workday is over... */ int vio_ssl_close(Vio *vio); void vio_ssl_delete(Vio *vio); - -int vio_ssl_blocking(Vio *vio, my_bool set_blocking_mode, my_bool *old_mode); - my_bool vio_ssl_has_data(Vio *vio); #endif /* HAVE_OPENSSL */ |