summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-26 01:44:23 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-26 01:44:23 +0000
commit3c4a6dd5a00758fb0fd1369eee77ac8785a4182f (patch)
tree533a99847850758b9a1d8f414002620c15f75826
parent4b4d150fb289ab91923c8ae6db80e9cc5e33062c (diff)
downloadruby-3c4a6dd5a00758fb0fd1369eee77ac8785a4182f.tar.gz
ruby-3c4a6dd5a00758fb0fd1369eee77ac8785a4182f.tar.xz
ruby-3c4a6dd5a00758fb0fd1369eee77ac8785a4182f.zip
* io.c (rb_read_internal, rb_sysopen_internal): remove C99 dependency.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c10
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 61691ba93..f312ea69f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 26 10:44:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (rb_read_internal, rb_sysopen_internal): remove C99 dependency.
+
Sun Nov 25 22:21:35 2007 Tanaka Akira <akr@fsij.org>
* include/ruby/encoding.h (rb_enc_str_asciionly_p): declared.
diff --git a/io.c b/io.c
index 1bc806470..ce1472ece 100644
--- a/io.c
+++ b/io.c
@@ -919,7 +919,10 @@ read_func(void *ptr)
static int
rb_read_internal(int fd, void *buf, size_t count)
{
- struct read_struct rs = {fd, buf, count};
+ struct read_struct rs;
+ rs.fd = fd;
+ rs.buf = buf;
+ rs.capa = count;
return rb_thread_blocking_region(read_func, &rs, RB_UBF_DFL, 0);
}
@@ -3049,7 +3052,10 @@ sysopen_func(void *ptr)
static int
rb_sysopen_internal(char *fname, int flags, unsigned int mode)
{
- struct sysopen_struct data = {fname, flags, mode};
+ struct sysopen_struct data;
+ data.fname = fname;
+ data.flag = flags;
+ data.mode = mode;
return (int)rb_thread_blocking_region(sysopen_func, &data, RB_UBF_DFL, 0);
}