diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-08 23:20:19 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-08 23:20:19 +0300 |
| commit | 9417dc5c17bc0c35d04e20e600ce7804ec20e736 (patch) | |
| tree | e7d13849a1d92edeaacd31753856f5a8cb389781 /vio/vio.c | |
| parent | 4c52928bc84a503fed81ebd7cf934a7857491aa5 (diff) | |
| download | mariadb-git-9417dc5c17bc0c35d04e20e600ce7804ec20e736.tar.gz | |
Portability fixes + a couple of bug fixes introduced by last push.
Docs/manual.texi:
Removed wrong web links
include/mysql_com.h:
Portability fix
libmysqld/Makefile.am:
Fix 'make dist'
mysys/mf_dirname.c:
Bugfix for last push
scripts/explain_log.sh:
Nicer output
scripts/mysql_install_db.sh:
Removed warnings when using 'mysql_install_db'
sql/sql_parse.cc:
Ensure that thd->query_length is always set
sql/sql_show.cc:
cleanup
sql/sql_yacc.yy:
Fix bug in last push
vio/vio.c:
Merge with violite.cc
vio/viosocket.c:
Merge with violite.cc
Diffstat (limited to 'vio/vio.c')
| -rw-r--r-- | vio/vio.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/vio/vio.c b/vio/vio.c index 15a12bb958d..95d318ba118 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -38,26 +38,10 @@ #include <sys/ioctl.h> #endif -#if defined(__EMX__) +#if defined(__EMX__) || defined(OS2) #define ioctlsocket ioctl #endif /* defined(__EMX__) */ -#if defined(MSDOS) || defined(__WIN__) -#ifdef __WIN__ -#undef errno -#undef EINTR -#undef EAGAIN -#define errno WSAGetLastError() -#define EINTR WSAEINTR -#define EAGAIN WSAEINPROGRESS -#endif /* __WIN__ */ -#define O_NONBLOCK 1 /* For emulation of fcntl() */ -#endif -#ifndef EWOULDBLOCK -#define EWOULDBLOCK EAGAIN -#endif - - /* * Helper to fill most of the Vio* with defaults. */ |