From 24aba0805467feda3ea23b8ea39f7b07188727f1 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 29 Aug 2008 23:59:32 +0000 Subject: [PATCH] * include/ruby/intern.h (rb_file_s_absolute_path), (rb_file_absolute_path): prototyped. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 19 ++++++++++++------- file.c | 4 +--- include/ruby/intern.h | 2 ++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60a7a5f49e..2ca099f8f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Aug 30 08:59:25 2008 Nobuyoshi Nakada + + * include/ruby/intern.h (rb_file_s_absolute_path), + (rb_file_absolute_path): prototyped. + Sat Aug 30 08:09:36 2008 NARUSE, Yui * encoding.c (enc_compatible_p): use TYPE not BUILTIN_TYPE. @@ -262,7 +267,7 @@ Wed Aug 27 01:13:54 2008 Tanaka Akira Wed Aug 27 01:03:23 2008 Tanaka Akira * include/ruby/encoding.h (rb_econv_result_t): enumeration constant: - econv_incomplete_input. + econv_incomplete_input. * io.c (finish_writeconv): check econv_incomplete_input. @@ -438,7 +443,7 @@ Mon Aug 25 23:38:17 2008 Tadayoshi Funaba Mon Aug 25 23:01:17 2008 Yukihiro Matsumoto * compile.c (defined_expr): default defined? should return - "expression" without evaluating the expression. [ruby-dev:35967] + "expression" without evaluating the expression. [ruby-dev:35967] Mon Aug 25 22:46:01 2008 Yusuke Endoh @@ -869,9 +874,9 @@ Fri Aug 22 21:18:40 2008 Tadayoshi Funaba * complex.c (rb_complex_polar): new. * rational.c (nurat_to_s): do not canonicalize. - + * rational.c (nurat_inspect): adopts new form. - + * rational.c (string_to_r_internal): ditto. * include/ruby/intern.h: added a declaration. @@ -1273,7 +1278,7 @@ Tue Aug 19 01:32:37 2008 Tanaka Akira Tue Aug 19 01:02:19 2008 Tanaka Akira - * io.c (rb_open_file): don't access argv[-1] by + * io.c (rb_open_file): don't access argv[-1] by File.allocate.instance_eval { initialize }. Tue Aug 19 00:56:01 2008 Tanaka Akira @@ -1424,10 +1429,10 @@ Sun Aug 17 12:00:18 2008 Tanaka Akira * transcode.c (make_econv_exception): add several instance variables to exception object. (ecerr_source_encoding): new method: - Encoding::ConversionUndefined#source_encoding and + Encoding::ConversionUndefined#source_encoding and Encoding::InvalidByteSequence#source_encoding. (ecerr_destination_encoding): new method: - Encoding::ConversionUndefined#destination_encoding and + Encoding::ConversionUndefined#destination_encoding and Encoding::InvalidByteSequence#destination_encoding. (econverr_error_char): new method: Encoding::ConversionUndefined#error_char. diff --git a/file.c b/file.c index 0cd90afb8b..527cd75059 100644 --- a/file.c +++ b/file.c @@ -2942,9 +2942,7 @@ rb_file_absolute_path(VALUE fname, VALUE dname) */ VALUE -rb_file_s_absolute_path(argc, argv) - int argc; - VALUE *argv; +rb_file_s_absolute_path(int argc, VALUE *argv) { VALUE fname, dname; diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 70fbb00ca0..b162375210 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -319,6 +319,8 @@ VALUE rb_exec_recursive(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE); /* file.c */ VALUE rb_file_s_expand_path(int, VALUE *); VALUE rb_file_expand_path(VALUE, VALUE); +VALUE rb_file_s_absolute_path(int, VALUE *); +VALUE rb_file_absolute_path(VALUE, VALUE); void rb_file_const(const char*, VALUE); int rb_find_file_ext(VALUE*, const char* const*); VALUE rb_find_file(VALUE);