archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

* io.c (nogvl_copy_stream_sendfile): mixed decls not allowed.

Browse source 
* include/ruby/ruby.h (rb_intern): C90 needs nonempty macro
	  arguments.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-05-08 17:41:49 +00:00
parent d42a249334
commit 93121d99c9
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sun May 9 02:37:33 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* io.c (nogvl_copy_stream_sendfile): mixed decls not allowed.
* include/ruby/ruby.h (rb_intern): C90 needs nonempty macro
arguments.
Sun May 9 01:15:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* cont.c (stackgrowdirection): removed duplicated code, use

4
include/ruby/ruby.h
View file

@ -1078,8 +1078,8 @@ VALUE rb_id2str(ID);
/* __builtin_constant_p and statement expression is available
* since gcc-2.7.2.3 at least. */
#define rb_intern(str) \
(__builtin_constant_p(str) ? \
__extension__ (CONST_ID_CACHE(/**/, str)) : \
(__builtin_constant_p(str) ?
__extension__ (CONST_ID_CACHE((ID), str)) : \
rb_intern(str))
#define rb_intern_const(str) \
(__builtin_constant_p(str) ? \

3
io.c
View file

@ -8078,8 +8078,9 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
if (use_pread)
copy_length = src_stat.st_size - src_offset;
else {
off_t cur;
errno = 0;
off_t cur = lseek(stp->src_fd, 0, SEEK_CUR);
cur = lseek(stp->src_fd, 0, SEEK_CUR);
if (cur == (off_t)-1 && errno) {
stp->syserr = "lseek";
stp->error_no = errno;