join 1.1c6

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1dev@310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 8 deletions

diff --git a/intern.h b/intern.h
index 5f6386b4b9..1192c27ddc 100644
--- a/intern.h
+++ b/intern.h
@@ -80,7 +80,7 @@ VALUE rb_singleton_class _((VALUE));
 VALUE rb_enum_length _((VALUE));
 /* error.c */
 extern int ruby_nerrs;
-VALUE rb_exc_new _((VALUE, char*, unsigned int));
+VALUE rb_exc_new _((VALUE, char*, int));
 VALUE rb_exc_new2 _((VALUE, char*));
 VALUE rb_exc_new3 _((VALUE, VALUE));
 void rb_loaderror __((char*, ...)) NORETURN;
@@ -108,7 +108,7 @@ VALUE rb_apply _((VALUE, ID, VALUE));
 VALUE rb_funcall2 _((VALUE, ID, int, VALUE*));
 void rb_backtrace _((void));
 ID rb_frame_last_func _((void));
-VALUE rb_f_load _((VALUE, VALUE));
+void rb_load _((VALUE, VALUE));
 void rb_provide _((char*));
 VALUE rb_f_require _((VALUE, VALUE));
 void rb_obj_call_init _((VALUE));
@@ -137,15 +137,16 @@ void rb_global_variable _((VALUE*));
 void rb_gc_mark_locations _((VALUE*, VALUE*));
 void rb_gc_mark_maybe();
 void rb_gc_mark();
-void rb_gc_force_recycle();
+void rb_gc_force_recycle _((VALUE));
 void rb_gc _((void));
 void rb_gc_call_finalizer_at_exit _((void));
 /* hash.c */
-VALUE rb_hash_freeze _((VALUE));
 VALUE rb_hash _((VALUE));
 VALUE rb_hash_new _((void));
+VALUE rb_hash_freeze _((VALUE));
 VALUE rb_hash_aref _((VALUE, VALUE));
 VALUE rb_hash_aset _((VALUE, VALUE, VALUE));
+void rb_path_check _((char *));
 int rb_env_path_tainted _((void));
 /* io.c */
 extern VALUE rb_fs;
@@ -154,7 +155,6 @@ extern VALUE rb_rs;
 extern VALUE rb_default_rs;
 extern VALUE rb_output_rs;
 VALUE rb_io_write _((VALUE, VALUE));
-VALUE rb_io_gets_method _((int, VALUE*, VALUE));
 VALUE rb_io_gets _((VALUE));
 VALUE rb_io_getc _((VALUE));
 VALUE rb_io_ungetc _((VALUE, VALUE));
@@ -162,7 +162,7 @@ VALUE rb_io_close _((VALUE));
 VALUE rb_io_binmode _((VALUE));
 int rb_io_mode_flags _((char*));
 VALUE rb_io_reopen _((VALUE, VALUE));
-VALUE rb_f_gets _((void));
+VALUE rb_gets _((void));
 void rb_str_setter _((VALUE, ID, VALUE*));
 /* numeric.c */
 void rb_num_zerodiv _((void));
@@ -239,7 +239,7 @@ void rb_trap_exec _((void));
 /* sprintf.c */
 VALUE rb_f_sprintf _((int, VALUE*));
 /* string.c */
-VALUE rb_str_new _((char*, unsigned int));
+VALUE rb_str_new _((char*, int));
 VALUE rb_str_new2 _((char*));
 VALUE rb_str_new3 _((VALUE));
 VALUE rb_str_new4 _((VALUE));
@@ -255,7 +255,7 @@ VALUE rb_str_dup_frozen _((VALUE));
 VALUE rb_str_taint _((VALUE));
 VALUE rb_str_tainted _((VALUE));
 VALUE rb_str_resize _((VALUE, int));
-VALUE rb_str_cat _((VALUE, char*, unsigned int));
+VALUE rb_str_cat _((VALUE, char*, int));
 VALUE rb_str_concat _((VALUE, VALUE));
 int rb_str_hash _((VALUE));
 int rb_str_cmp _((VALUE, VALUE));