diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-03 12:24:13 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-03 12:24:13 +0000 |
| commit | 78f0aebe1fecadd387989a8ac818c0fe3179ada0 (patch) | |
| tree | 23708bab33d3d48b2ea7fc223e7c0cfee99798ef /ext | |
| parent | 877a9a7d994fc9255db33f86d73f08870be8b234 (diff) | |
merges r32067 from trunk into ruby_1_9_2.
--
* parse.y (parser_parse_string): flush delayed token. based on a
patch by Masaya Tarui in [ruby-dev:43762]. Bug #4544
* parse.y (yylex): revert r24557. delayed token at the end of
string should be flushed already by the above change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/unixsocket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index d32567c686..3e3a8ba0d7 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -248,7 +248,7 @@ unix_send_io(VALUE sock, VALUE val) #endif arg.fd = fptr->fd; - while ((int)BLOCKING_REGION_FD(sendmsg_blocking, &arg) == -1) { + while ((int)BLOCKING_REGION(sendmsg_blocking, &arg) == -1) { if (!rb_io_wait_writable(arg.fd)) rb_sys_fail("sendmsg(2)"); } @@ -335,7 +335,7 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock) #endif arg.fd = fptr->fd; - while ((int)BLOCKING_REGION_FD(recvmsg_blocking, &arg) == -1) { + while ((int)BLOCKING_REGION(recvmsg_blocking, &arg) == -1) { if (!rb_io_wait_readable(arg.fd)) rb_sys_fail("recvmsg(2)"); } |