diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-18 09:44:36 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-18 09:44:36 +0000 |
commit | 449cceb8b15866cae899ce2c429ca23a4a6fa96b (patch) | |
tree | b2b277c8db2049d070f1b7299a9eea5028c1c5e2 | |
parent | 8fc054fdff2deab672fab303e6943daaefd9c084 (diff) | |
download | ruby-449cceb8b15866cae899ce2c429ca23a4a6fa96b.tar.gz |
merge extern declarations into internal.h
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | error.c | 2 | ||||
-rw-r--r-- | eval.c | 2 | ||||
-rw-r--r-- | internal.h | 3 | ||||
-rw-r--r-- | process.c | 2 | ||||
-rw-r--r-- | signal.c | 3 |
5 files changed, 3 insertions, 9 deletions
@@ -867,11 +867,9 @@ static ID id_new, id_cause, id_message, id_backtrace; static ID id_name, id_key, id_args, id_Errno, id_errno, id_i_path; static ID id_receiver, id_iseq, id_local_variables; static ID id_private_call_p; -extern ID ruby_static_id_status; #define id_bt idBt #define id_bt_locations idBt_locations #define id_mesg idMesg -#define id_status ruby_static_id_status #undef rb_exc_new_cstr @@ -26,8 +26,6 @@ VALUE rb_eSysStackError; ID ruby_static_id_signo, ruby_static_id_status; static ID id_cause; -#define id_signo ruby_static_id_signo -#define id_status ruby_static_id_status #define exception_error GET_VM()->special_exceptions[ruby_error_reenter] diff --git a/internal.h b/internal.h index 2d1b942fc3..20c1f9750c 100644 --- a/internal.h +++ b/internal.h @@ -1209,6 +1209,9 @@ VALUE rb_warning_string(const char *fmt, ...); /* eval.c */ VALUE rb_refinement_module_get_refined_class(VALUE module); +extern ID ruby_static_id_signo, ruby_static_id_status; +#define id_signo ruby_static_id_signo +#define id_status ruby_static_id_status /* eval_error.c */ VALUE rb_get_backtrace(VALUE info); @@ -273,8 +273,6 @@ static ID id_CLOCK_BASED_CLOCK_PROCESS_CPUTIME_ID; static ID id_MACH_ABSOLUTE_TIME_BASED_CLOCK_MONOTONIC; #endif static ID id_hertz; -extern ID ruby_static_id_status; -#define id_status ruby_static_id_status /* execv and execl are async-signal-safe since SUSv4 (POSIX.1-2008, XPG7) */ #if defined(__sun) && !defined(_XPG7) /* Solaris 10, 9, ... */ @@ -41,9 +41,6 @@ # define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0 #endif -extern ID ruby_static_id_signo; -#define id_signo ruby_static_id_signo - #ifdef NEED_RUBY_ATOMIC_OPS rb_atomic_t ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val) |