diff options
| author | unknown <tim@black.box> | 2001-11-02 09:57:22 -0500 |
|---|---|---|
| committer | unknown <tim@black.box> | 2001-11-02 09:57:22 -0500 |
| commit | 36a4cc178fc574dd9996c620eca609fe456d8c58 (patch) | |
| tree | 873e1b49346d3abd568b33dd335add041a109bd5 /include | |
| parent | 2616ebfed994f303412bc36d0fa746145d41a0fa (diff) | |
| parent | e61ecd1abb916335e0fde70547df57230aa8df28 (diff) | |
| download | mariadb-git-36a4cc178fc574dd9996c620eca609fe456d8c58.tar.gz | |
Merge work.mysql.com:/home/bk/mysql-4.0 into black.box:/u/home/tim/my/4
Docs/manual.texi:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/violite.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/violite.h b/include/violite.h index d5f697b26c4..9a2146c1978 100644 --- a/include/violite.h +++ b/include/violite.h @@ -102,9 +102,6 @@ my_bool vio_peer_addr(Vio* vio, char *buf); void vio_in_addr(Vio *vio, struct in_addr *in); - /* Return 1 if there is data to be read */ -my_bool vio_poll_read(Vio *vio,uint timeout); - #ifdef __cplusplus } #endif @@ -122,7 +119,6 @@ my_bool vio_poll_read(Vio *vio,uint timeout); #define vio_close(vio) ((vio)->vioclose)(vio) #define vio_peer_addr(vio, buf) (vio)->peer_addr(vio, buf) #define vio_in_addr(vio, in) (vio)->in_addr(vio, in) -#define vio_poll_read(vio,timeout) (vio)->poll_read(vio,timeout) #endif /* defined(HAVE_VIO) && !defined(DONT_MAP_VIO) */ #ifdef HAVE_OPENSSL @@ -155,9 +151,6 @@ int vio_ssl_errno(Vio *vio); my_bool vio_ssl_peer_addr(Vio* vio, char *buf); void vio_ssl_in_addr(Vio *vio, struct in_addr *in); -/* Return 1 if there is data to be read */ -my_bool vio_ssl_poll_read(Vio *vio,uint timeout); - /* Single copy for server */ struct st_VioSSLAcceptorFd { @@ -227,7 +220,6 @@ struct st_vio void (*in_addr)(Vio*, struct in_addr*); my_bool (*should_retry)(Vio*); int (*vioclose)(Vio*); - my_bool (*poll_read)(Vio*,uint); #ifdef HAVE_OPENSSL SSL* ssl_; |