diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | include/ruby/intern.h | 7 | ||||
| -rw-r--r-- | internal.h | 8 |
3 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,7 @@ +Thu Jul 19 14:30:43 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * internal.h: move mark function declarations that should be private. + Thu Jul 19 14:18:22 2012 NAKAMURA Usaku <usa@ruby-lang.org> * ext/socket/init.c (rsock_init_sock): need to update max fd on all diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 96ce961277..f28ad5e186 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -385,7 +385,6 @@ int rb_mod_method_arity(VALUE, ID); int rb_obj_method_arity(VALUE, ID); VALUE rb_protect(VALUE (*)(VALUE), VALUE, int*); void rb_set_end_proc(void (*)(VALUE), VALUE); -void rb_mark_end_proc(void); void rb_exec_end_proc(void); void rb_thread_schedule(void); void rb_thread_wait_fd(int); @@ -562,7 +561,6 @@ double rb_str_to_dbl(VALUE, int); RUBY_EXTERN int ruby_sourceline; RUBY_EXTERN char *ruby_sourcefile; ID rb_id_attrset(ID); -void rb_gc_mark_parser(void); int rb_is_const_id(ID); int rb_is_global_id(ID); int rb_is_instance_id(ID); @@ -572,7 +570,6 @@ int rb_is_local_id(ID); int rb_is_junk_id(ID); int rb_symname_p(const char*); int rb_sym_interned_p(VALUE); -void rb_gc_mark_symbols(void); VALUE rb_backref_get(void); void rb_backref_set(VALUE); VALUE rb_lastline_get(void); @@ -641,7 +638,6 @@ VALUE rb_get_argv(void); void *rb_load_file(const char*); /* signal.c */ VALUE rb_f_kill(int, VALUE*); -void rb_gc_mark_trap_list(void); #ifdef POSIX_SIGNAL #define posix_signal ruby_posix_signal RETSIGTYPE (*posix_signal(int, RETSIGTYPE (*)(int)))(int); @@ -853,15 +849,12 @@ VALUE rb_class_name(VALUE); void rb_autoload(VALUE, ID, const char*); VALUE rb_autoload_load(VALUE, ID); VALUE rb_autoload_p(VALUE, ID); -void rb_gc_mark_global_tbl(void); VALUE rb_f_trace_var(int, VALUE*); VALUE rb_f_untrace_var(int, VALUE*); VALUE rb_f_global_variables(void); void rb_alias_variable(ID, ID); struct st_table* rb_generic_ivar_table(VALUE); void rb_copy_generic_ivar(VALUE,VALUE); -void rb_mark_generic_ivar(VALUE); -void rb_mark_generic_ivar_tbl(void); void rb_free_generic_ivar(VALUE); VALUE rb_ivar_get(VALUE, ID); VALUE rb_ivar_set(VALUE, ID, VALUE); diff --git a/internal.h b/internal.h index a80ea30c9c..08291afdf2 100644 --- a/internal.h +++ b/internal.h @@ -95,6 +95,7 @@ VALUE rb_get_backtrace(VALUE info); /* eval_jump.c */ void rb_call_end_proc(VALUE data); +void rb_mark_end_proc(void); /* file.c */ VALUE rb_home_dir(const char *user, VALUE result); @@ -156,6 +157,8 @@ int rb_is_attrset_name(VALUE name); int rb_is_local_name(VALUE name); int rb_is_method_name(VALUE name); int rb_is_junk_name(VALUE name); +void rb_gc_mark_parser(void); +void rb_gc_mark_symbols(void); /* proc.c */ VALUE rb_proc_location(VALUE self); @@ -311,6 +314,11 @@ int rb_execarg_run_options(const struct rb_execarg *e, struct rb_execarg *s, cha VALUE rb_execarg_extract_options(VALUE execarg_obj, VALUE opthash); void rb_execarg_setenv(VALUE execarg_obj, VALUE env); +/* variable.c */ +void rb_gc_mark_global_tbl(void); +void rb_mark_generic_ivar(VALUE); +void rb_mark_generic_ivar_tbl(void); + #if defined __GNUC__ && __GNUC__ >= 4 #pragma GCC visibility pop #endif |