From d378b1e3e388f3f6783af09df96a829d7b73f5ab Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 8 Oct 2001 23:20:19 +0300 Subject: 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 --- vio/vio.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'vio/vio.c') 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 #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. */ -- cgit v1.2.1