diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-11-16 16:56:59 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-11-16 16:56:59 +0000 |
commit | 46608d361a199ee96ce71043d03d5e2dbed3cf66 (patch) | |
tree | 618613d37376e21376cc974473ad1830442ebfad | |
parent | 0d11c322d107ccb3e53d5a429c89fc954c561a93 (diff) | |
download | ruby-46608d361a199ee96ce71043d03d5e2dbed3cf66.tar.gz |
001117
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ext/socket/socket.c | 1 | ||||
-rw-r--r-- | io.c | 14 | ||||
-rw-r--r-- | version.h | 4 |
3 files changed, 3 insertions, 16 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index e77e3d609f..e664090cf1 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -769,6 +769,7 @@ ruby_connect(fd, sockaddr, len, socks) } } #ifdef HAVE_FCNTL + mode &= ~NONBLOCKING; /* needed? */ fcntl(fd, F_SETFL, mode); #endif return status; @@ -123,20 +123,6 @@ extern int ReadDataPending(); }\ } while(0) -#ifndef EWOULDBLOCK -#define EWOULDBLOCK EAGAIN -#endif - -#ifdef O_NDELAY -# define NONBLOCKING O_NDELAY -#else -#ifdef O_NBIO -# define NONBLOCKING O_NBIO -#else -# define NONBLOCKING O_NONBLOCK -#endif -#endif - void rb_eof_error() { @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.6.2" -#define RUBY_RELEASE_DATE "2000-11-16" +#define RUBY_RELEASE_DATE "2000-11-17" #define RUBY_VERSION_CODE 162 -#define RUBY_RELEASE_CODE 20001116 +#define RUBY_RELEASE_CODE 20001117 |