diff options
| author | monty@hundin.mysql.fi <> | 2002-06-03 12:59:31 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-06-03 12:59:31 +0300 |
| commit | f0b28da6f91cf87804015b5dde4820be040c2de7 (patch) | |
| tree | be04186411dc657ef6bbcbe01267d30f2675c914 /vio/vio.c | |
| parent | 3ede8f6289b53345f44aecffd70c7e291f88186b (diff) | |
| parent | 544f95c45112993df1d31d3eda859dd5e4efff89 (diff) | |
| download | mariadb-git-f0b28da6f91cf87804015b5dde4820be040c2de7.tar.gz | |
merge with 4.0
Diffstat (limited to 'vio/vio.c')
| -rw-r--r-- | vio/vio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/vio.c b/vio/vio.c index 62814e50240..67cb7ec95cd 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -96,7 +96,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost) sprintf(vio->desc, (vio->type == VIO_TYPE_SOCKET ? "socket (%d)" : "TCP/IP (%d)"), vio->sd); -#if !defined(___WIN__) && !defined(__EMX__) +#if !defined(___WIN__) && !defined(__EMX__) && !defined(OS2) #if !defined(NO_FCNTL_NONBLOCK) vio->fcntl_mode = fcntl(sd, F_GETFL); #elif defined(HAVE_SYS_IOCTL_H) /* hpux */ |