Permalink
Browse files

* rubyio.h (rb_io_t): renamed from OpenFile.

* ruby.h (struct RHash), file.c, gc.c, io.c, ext/dl/dl.c,
  ext/io/wait/wait.c, ext/pty/pty.c, ext/readline/readline.c,
  ext/socket/socket.c: ditto.

* win32/win32.h: removed workaround for OpenFile.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@16025 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 5631684 commit 946b98124af6e40459087adc835e9f14c83ef5e2 @nobu nobu committed Apr 15, 2008
Showing with 162 additions and 152 deletions.
  1. +10 −0 ChangeLog
  2. +1 −1 ext/dl/dl.c
  3. +2 −2 ext/io/wait/wait.c
  4. +1 −1 ext/pty/pty.c
  5. +1 −1 ext/readline/readline.c
  6. +39 −39 ext/socket/socket.c
  7. +13 −13 file.c
  8. +1 −1 gc.c
  9. +79 −79 io.c
  10. +1 −1 ruby.h
  11. +14 −11 rubyio.h
  12. +0 −3 win32/win32.h
View
@@ -1,3 +1,13 @@
+Tue Apr 15 12:35:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * rubyio.h (rb_io_t): renamed from OpenFile.
+
+ * ruby.h (struct RHash), file.c, gc.c, io.c, ext/dl/dl.c,
+ ext/io/wait/wait.c, ext/pty/pty.c, ext/readline/readline.c,
+ ext/socket/socket.c: ditto.
+
+ * win32/win32.h: removed workaround for OpenFile.
+
Tue Apr 15 00:15:29 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/text.rb: typo. call a wrong method.
View
@@ -551,7 +551,7 @@ rb_ary_to_ptr(int argc, VALUE argv[], VALUE self)
VALUE
rb_io_to_ptr(VALUE self)
{
- OpenFile *fptr;
+ rb_io_t *fptr;
FILE *fp;
GetOpenFile(self, fptr);
View
@@ -56,7 +56,7 @@ static VALUE
io_ready_p(io)
VALUE io;
{
- OpenFile *fptr;
+ rb_io_t *fptr;
FILE *fp;
ioctl_arg n;
@@ -84,7 +84,7 @@ io_wait(argc, argv, io)
VALUE *argv;
VALUE io;
{
- OpenFile *fptr;
+ rb_io_t *fptr;
fd_set rd;
FILE *fp;
int fd;
View
@@ -416,7 +416,7 @@ pty_getpty(argc, argv, self)
VALUE res;
struct pty_info info;
struct pty_info thinfo;
- OpenFile *wfptr,*rfptr;
+ rb_io_t *wfptr,*rfptr;
VALUE rport = rb_obj_alloc(rb_cFile);
VALUE wport = rb_obj_alloc(rb_cFile);
char SlaveName[DEVICELEN];
@@ -79,7 +79,7 @@ readline_readline(argc, argv, self)
char *prompt = NULL;
char *buff;
int status;
- OpenFile *ofp, *ifp;
+ rb_io_t *ofp, *ifp;
rb_secure(4);
if (rb_scan_args(argc, argv, "02", &tmp, &add_hist) > 0) {
Oops, something went wrong. Retry.

0 comments on commit 946b981

Please sign in to comment.