From 44e08324c7494a626c1801e4d1f6a09353928586 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 1 Apr 2010 00:54:37 +0000 Subject: [PATCH] * include/ruby/ruby.h (RUBY_{DEFAULT,NEVER}_FREE): added. [ruby-dev:40889] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ include/ruby/ruby.h | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 017dbc1d93..909706d304 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Apr 1 09:54:27 2010 Nobuyoshi Nakada + + * include/ruby/ruby.h (RUBY_{DEFAULT,NEVER}_FREE): added. + [ruby-dev:40889] + Thu Apr 1 04:55:08 2010 Tanaka Akira * time.c (rb_big_abs_find_minbit): fix handling the last word. diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 71205dcf05..26bd2ee065 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -757,7 +757,10 @@ VALUE rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t int rb_typeddata_is_kind_of(VALUE, const rb_data_type_t *); void *rb_check_typeddata(VALUE, const rb_data_type_t *); #define Check_TypedStruct(v,t) rb_check_typeddata((VALUE)(v),t) -#define RUBY_TYPED_DEFAULT_FREE ((void (*)(void *))-1) +#define RUBY_DEFAULT_FREE ((RUBY_DATA_FUNC)-1) +#define RUBY_NEVER_FREE ((RUBY_DATA_FUNC)0) +#define RUBY_TYPED_DEFAULT_FREE RUBY_DEFAULT_FREE +#define RUBY_TYPED_NEVER_FREE RUBY_NEVER_FREE #define Data_Wrap_Struct(klass,mark,free,sval)\ rb_data_object_alloc(klass,sval,(RUBY_DATA_FUNC)mark,(RUBY_DATA_FUNC)free)