diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-17 07:56:26 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-17 07:56:26 +0000 |
commit | f1de89ce060a49e0c7f0364dc377748c3fab03ad (patch) | |
tree | 2ae6f225b0c0ebe386896fefa4705b9b6c078edc /include | |
parent | ad10b43f7f3a56dd77708416a6cf5b2f16d07325 (diff) |
merge revision(s) 61323: [Backport #15069]
suppress warning: 'const' attribute on function returning 'void'
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@65109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
-rw-r--r-- | include/ruby/intern.h | 4 | ||||
-rw-r--r-- | include/ruby/ruby.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/ruby/intern.h b/include/ruby/intern.h index efa8f4058c..bd248da8db 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -254,9 +254,9 @@ NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error_with_enc(const char*, int, NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error_append(const char*, ...), 1, 2))); NORETURN(void rb_error_frozen(const char*)); NORETURN(void rb_error_frozen_object(VALUE)); -CONSTFUNC(void rb_error_untrusted(VALUE)); +void rb_error_untrusted(VALUE); void rb_check_frozen(VALUE); -CONSTFUNC(void rb_check_trusted(VALUE)); +void rb_check_trusted(VALUE); #define rb_check_frozen_internal(obj) do { \ VALUE frozen_obj = (obj); \ if (OBJ_FROZEN(frozen_obj)) { \ diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index ffec7050d3..21b3d1755f 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -628,7 +628,7 @@ int ruby_safe_level_2_warning(void) __attribute__((const,warning("$SAFE=2 to 4 a # define rb_set_safe_level(level) rb_set_safe_level(RUBY_SAFE_LEVEL_CHECK(level, error)) #endif void rb_set_safe_level_force(int); -CONSTFUNC(void rb_secure_update(VALUE)); +void rb_secure_update(VALUE); NORETURN(void rb_insecure_operation(void)); VALUE rb_errinfo(void); |