diff options
| author | unknown <tonu@hundin.mysql.fi> | 2001-06-08 22:28:57 +0300 |
|---|---|---|
| committer | unknown <tonu@hundin.mysql.fi> | 2001-06-08 22:28:57 +0300 |
| commit | 32692277b9ef3c387eaf88b80dde262272a69b41 (patch) | |
| tree | e4b889f31b7f39f63449053c9966b889a695698a /include/violite.h | |
| parent | 17bc31504df4a9590d9ebb340074aceb509630ca (diff) | |
| download | mariadb-git-32692277b9ef3c387eaf88b80dde262272a69b41.tar.gz | |
Fixed compile-time warnings
vio/viossl.c:
Fixed compile-time warnings by moving code around plus small fixes
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/violite.h b/include/violite.h index a94f6787731..bc10a8f527c 100644 --- a/include/violite.h +++ b/include/violite.h @@ -35,6 +35,10 @@ extern "C" { enum enum_vio_type { VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET, VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL}; +#ifndef __WIN__ +#define HANDLE void * +#endif + Vio* vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost); @@ -45,6 +49,10 @@ void vio_delete(Vio* vio); #ifdef EMBEDDED_LIBRARY void vio_reset(Vio *vio); +#else +void vio_reset(Vio* vio, enum enum_vio_type type, + my_socket sd, HANDLE hPipe, + my_bool localhost); #endif /* @@ -188,8 +196,6 @@ struct st_VioSSLAcceptorFd /* One copy for client */ struct st_VioSSLConnectorFd { - BIO* bio_; - gptr ssl_; SSL_CTX* ssl_context_; SSL_METHOD* ssl_method_; /* function pointers which are only once for SSL client */ @@ -212,10 +218,6 @@ Vio* new_VioSSL(struct st_VioSSLAcceptorFd* fd, Vio* sd,int state); #endif #endif /* HAVE_OPENSSL */ -#ifndef __WIN__ -#define HANDLE void * -#endif - #ifndef EMBEDDED_LIBRARY /* This structure is for every connection on both sides */ struct st_vio |