From ecf0c48d5a8308500f2331287fe88c88d6c43b70 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 12 Sep 2003 03:30:45 +0000 Subject: [PATCH] * intern.h (rb_disable_super, rb_enable_super): replace with dummy expressions instead of prototypes. the functions remain yet for binary compatibility. [ruby-talk:81758] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++-- eval.c | 3 +++ intern.h | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e320cb8c20..5e2292669c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Sep 12 12:30:41 2003 Nobuyoshi Nakada + + * intern.h (rb_disable_super, rb_enable_super): replace with dummy + expressions instead of prototypes. the functions remain yet for + binary compatibility. [ruby-talk:81758] + Fri Sep 12 12:09:54 2003 Yukihiro Matsumoto * bignum.c (rb_big_and): convert argument using 'to_int'. @@ -16,7 +22,7 @@ Thu Sep 11 08:43:44 2003 Yukihiro Matsumoto * eval.c (rb_f_require): allow "require" on $SAFE>0, if feature name is not tainted. - * lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::stream): + * lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::stream): Supports StringIO. Wed Sep 10 22:47:30 2003 GOTOU Yuuzou @@ -29,7 +35,7 @@ Wed Sep 10 22:47:30 2003 GOTOU Yuuzou * ext/openssl/ossl_config.c (ossl_config_add_value): ditto. - * ext/openssl/ossl_config.c (set_conf_section_i): should check + * ext/openssl/ossl_config.c (set_conf_section_i): should check if the argument is Array. Wed Sep 10 22:41:54 2003 Tietew diff --git a/eval.c b/eval.c index 513af340c8..4eeb9670b9 100644 --- a/eval.c +++ b/eval.c @@ -460,6 +460,9 @@ rb_mod_remove_method(argc, argv, mod) return mod; } +#undef rb_disable_super +#undef rb_enable_super + void rb_disable_super(klass, name) VALUE klass; diff --git a/intern.h b/intern.h index 1850f7b187..3417acb08b 100644 --- a/intern.h +++ b/intern.h @@ -146,8 +146,8 @@ NORETURN(void rb_exc_fatal _((VALUE))); VALUE rb_f_exit _((int,VALUE*)); VALUE rb_f_abort _((int,VALUE*)); void rb_remove_method _((VALUE, const char*)); -void rb_disable_super _((VALUE, const char*)); -void rb_enable_super _((VALUE, const char*)); +#define rb_disable_super(klass, name) ((void)0) +#define rb_enable_super(klass, name) ((void)0) #define HAVE_RB_DEFINE_ALLOC_FUNC 1 void rb_define_alloc_func _((VALUE, VALUE (*)(VALUE))); void rb_undef_alloc_func _((VALUE));