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 | |
| 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
| -rw-r--r-- | include/ruby/intern.h | 4 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 2 | ||||
| -rw-r--r-- | internal.h | 4 | ||||
| -rw-r--r-- | version.h | 8 |
4 files changed, 9 insertions, 9 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); diff --git a/internal.h b/internal.h index 95fc9822e1..d557dcf23b 100644 --- a/internal.h +++ b/internal.h @@ -965,7 +965,7 @@ VALUE rb_invcmp(VALUE, VALUE); struct rb_block; int rb_dvar_defined(ID, const struct rb_block *); int rb_local_defined(ID, const struct rb_block *); -CONSTFUNC(const char * rb_insns_name(int i)); +const char * rb_insns_name(int i); VALUE rb_insns_name_array(void); /* complex.c */ @@ -988,7 +988,7 @@ void Init_ext(void); /* encoding.c */ ID rb_id_encoding(void); -CONSTFUNC(void rb_gc_mark_encodings(void)); +void rb_gc_mark_encodings(void); rb_encoding *rb_enc_get_from_index(int index); rb_encoding *rb_enc_check_str(VALUE str1, VALUE str2); int rb_encdb_replicate(const char *alias, const char *orig); @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.4.5" -#define RUBY_RELEASE_DATE "2018-09-06" -#define RUBY_PATCHLEVEL 323 +#define RUBY_RELEASE_DATE "2018-10-17" +#define RUBY_PATCHLEVEL 324 #define RUBY_RELEASE_YEAR 2018 -#define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 6 +#define RUBY_RELEASE_MONTH 10 +#define RUBY_RELEASE_DAY 17 #include "ruby/version.h" |