diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-05 11:30:35 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-05 11:30:35 +0000 |
| commit | dd7e98f44dd7d185111d3177b97feb554aa8abee (patch) | |
| tree | 8dec2a7f2f2d974099c04d4cfc946806e4130989 /include | |
| parent | 4afd46b9baaaa0317fb735b05b74700c11e55950 (diff) | |
| download | ruby-dd7e98f44dd7d185111d3177b97feb554aa8abee.tar.gz ruby-dd7e98f44dd7d185111d3177b97feb554aa8abee.tar.xz ruby-dd7e98f44dd7d185111d3177b97feb554aa8abee.zip | |
* include/ruby/io.h (rb_io_modestr_fmode): renamed from
rb_io_mode_flags.
(rb_io_modestr_oflags): renamed from rb_io_mode_modenum.
(rb_io_oflags_fmode): renamed from rb_io_modenum_flags.
(rb_io_mode_flags): defined as a macro.
(rb_io_modenum_flags): ditto.
* io.c: follow the renaming with consistency.
* process.c (check_exec_redirect): call rb_io_modestr_oflags.
* ext/pty/depend: pty.o depends on io.h.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/io.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/ruby/io.h b/include/ruby/io.h index 610d3657e..1b28a8bf7 100644 --- a/include/ruby/io.h +++ b/include/ruby/io.h @@ -138,9 +138,9 @@ typedef struct rb_io_t { FILE *rb_io_stdio_file(rb_io_t *fptr); FILE *rb_fdopen(int, const char*); -int rb_io_mode_flags(const char*); -int rb_io_modenum_flags(int); -int rb_io_mode_modenum(const char *mode); +int rb_io_modestr_fmode(const char *modestr); +int rb_io_modestr_oflags(const char *modestr); +int rb_io_oflags_fmode(int oflags); void rb_io_check_writable(rb_io_t*); void rb_io_check_readable(rb_io_t*); int rb_io_fptr_finalize(rb_io_t*); @@ -151,6 +151,10 @@ int rb_io_wait_readable(int); int rb_io_wait_writable(int); void rb_io_set_nonblock(rb_io_t *fptr); +/* compatibility for ruby 1.8 and older */ +#define rb_io_mode_flags(modestr) rb_io_modestr_fmode(modestr) +#define rb_io_modenum_flags(oflags) rb_io_oflags_fmode(oflags) + VALUE rb_io_taint_check(VALUE); NORETURN(void rb_eof_error(void)); |