diff options
| author | brian@zim.(none) <> | 2006-04-15 18:17:32 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2006-04-15 18:17:32 -0700 |
| commit | 5d1d27c0165c151fd73163fa7d9bce353d6f9687 (patch) | |
| tree | 4deb7a54227f30d8a5d4b647405eb100c0f8ab28 /vio/vio.c | |
| parent | 53dce52086e38375f73bde3c5936ba381dc0c435 (diff) | |
| download | mariadb-git-5d1d27c0165c151fd73163fa7d9bce353d6f9687.tar.gz | |
Final patch to remove the last of the OS2 support.
Diffstat (limited to 'vio/vio.c')
| -rw-r--r-- | vio/vio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vio/vio.c b/vio/vio.c index bc286b2d2bb..9ace22e3780 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -147,7 +147,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, uint flags) sprintf(vio->desc, (vio->type == VIO_TYPE_SOCKET ? "socket (%d)" : "TCP/IP (%d)"), vio->sd); -#if !defined(__WIN__) && !defined(__EMX__) && !defined(OS2) +#if !defined(__WIN__) #if !defined(NO_FCNTL_NONBLOCK) /* We call fcntl() to set the flags and then immediately read them back @@ -166,7 +166,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, uint flags) (void) ioctl(sd,FIOSNBIO,0); vio->fcntl_mode &= ~O_NONBLOCK; #endif -#else /* !defined(__WIN__) && !defined(__EMX__) */ +#else /* !defined(__WIN__) */ { /* set to blocking mode by default */ ulong arg=0, r; |