diff options
| author | unknown <tim@hundin.mysql.fi> | 2001-06-05 04:15:13 +0300 |
|---|---|---|
| committer | unknown <tim@hundin.mysql.fi> | 2001-06-05 04:15:13 +0300 |
| commit | d637e1dcd5b2bec697e1fab2118ba9ffc88afcb5 (patch) | |
| tree | 4c562f3ad2fa639cce728bee3e5cf3a62dc973b5 | |
| parent | bd58e5e12fd7ceae0cc314ebbe899fa209e9561a (diff) | |
| download | mariadb-git-d637e1dcd5b2bec697e1fab2118ba9ffc88afcb5.tar.gz | |
violite.h Don't define st_vio if EMBEDDED_LIBRARY.
include/violite.h:
Don't define st_vio if EMBEDDED_LIBRARY.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | include/violite.h | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index f0cdb32efbd..af3c6be0610 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -7,3 +7,4 @@ paul@central.snake.net sasha@mysql.sashanet.com tonu@hundin.mysql.fi tim@threads.polyesthetic.msg +tim@hundin.mysql.fi diff --git a/include/violite.h b/include/violite.h index ffef4d68c73..a94f6787731 100644 --- a/include/violite.h +++ b/include/violite.h @@ -143,10 +143,6 @@ extern "C" { void vio_ssl_delete(Vio* vio); -#ifdef EMBEDDED_LIBRARY -void vio_reset(Vio *vio); -#endif - int vio_ssl_read(Vio* vio,gptr buf, int size); int vio_ssl_write(Vio* vio,const gptr buf,int size); int vio_ssl_blocking(Vio* vio,my_bool onoff); @@ -220,6 +216,7 @@ Vio* new_VioSSL(struct st_VioSSLAcceptorFd* fd, Vio* sd,int state); #define HANDLE void * #endif +#ifndef EMBEDDED_LIBRARY /* This structure is for every connection on both sides */ struct st_vio { @@ -254,5 +251,5 @@ struct st_vio #endif /* HAVE_OPENSSL */ #endif /* HAVE_VIO */ }; - +#endif /* EMBEDDED_LIBRARY */ |