diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-09 03:35:29 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-09 03:35:29 +0300 |
| commit | 1c64f355b4e0bb7a709dd850857a9bb41b11d09c (patch) | |
| tree | 07f2a0acc005ba2b7fb714ce60cb6f8417c6f60e /vio/viosocket.c | |
| parent | 9417dc5c17bc0c35d04e20e600ce7804ec20e736 (diff) | |
| download | mariadb-git-1c64f355b4e0bb7a709dd850857a9bb41b11d09c.tar.gz | |
One should not only have to include my_net.h to work with sockets.
This wrapper noew will include all the necessary, system specific files,
which makes all normal source files much easier to write and maintain.
Portability fixes.
Docs/manual.texi:
Updated upgrading from 3.23 -> 4.0
client/mysqladmin.c:
Portability fixes
client/mysqlshow.c:
Portability fixes
extra/resolveip.c:
Portability fixes
include/my_global.h:
Portability fixes
include/my_net.h:
One should not only have to include my_net.h to work with sockets.
This wrapper noew will include all the necessary, system specific files,
which makes all normal source files much easier to write and maintain.
include/mysql_com.h:
Portability fixes
libmysql/net.c:
Portability fixes
libmysqld/lib_vio.c:
Portability fixes
mysql-test/r/drop.result:
Fix crashed tests
mysql-test/r/err000001.result:
Fix crashed tests
mysql-test/r/innodb.result:
Fix crashed tests
mysql-test/r/overflow.result:
Fix crashed tests
sql/net_serv.cc:
Use new my_net.h
vio/vio.c:
Use new my_net.h
vio/viosocket.c:
Use new my_net.h
vio/viossl.c:
Use new my_net.h
Diffstat (limited to 'vio/viosocket.c')
| -rw-r--r-- | vio/viosocket.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index aacfab42810..f6f62924b00 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -27,36 +27,10 @@ #include <mysql_com.h> #include <errno.h> -#include <assert.h> #include <violite.h> #include <my_sys.h> #include <my_net.h> #include <m_string.h> -#ifdef HAVE_POLL -#include <sys/poll.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif - - -#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) -#include <netinet/ip.h> -#if !defined(alpha_linux_port) -#include <netinet/tcp.h> -#endif -#endif - -#if defined(__EMX__) || defined(OS2) -#define ioctlsocket ioctl -#endif /* defined(__EMX__) */ - -#if defined(MSDOS) || defined(__WIN__) -#define O_NONBLOCK 1 /* For emulation of fcntl() */ -#endif -#ifndef EWOULDBLOCK -#define SOCKET_EWOULDBLOCK SOCKET_EAGAIN -#endif #ifndef __WIN__ #define HANDLE void * @@ -243,7 +217,8 @@ my_bool vio_should_retry(Vio * vio __attribute__((unused))) { int en = socket_errno; - return en == SOCKET_EAGAIN || en == SOCKET_EINTR || en == SOCKET_EWOULDBLOCK; + return (en == SOCKET_EAGAIN || en == SOCKET_EINTR || + en == SOCKET_EWOULDBLOCK); } |