From 8695612caf8afe1138a7baaa142658dd93c70293 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 16 Aug 2003 14:58:34 +0000 Subject: * marshal.c (w_symbol, w_object): get rid of warnings. * re.c (rb_memsearch): ditto. * time.c (time_dump): ditto. * ext/extmk.rb (extmake): not continue making when extconf.rb failed. * ext/openssl/extconf.rb: check __VA_ARGS__ macro more precisely. * ext/openssl/ossl.h: remove version.h dependency. * ext/openssl/ruby_missing.h: ditto. * lib/mkmf.rb (pkg_config): use --libs output except with only-L for other options. [ruby-list:38099] * lib/mkmf.rb (create_makefile): separate rule for static library from shared object. * win32/Makefile.sub, bcc32/Makefile.sub, wince/Makefile.sub: define exec_prefix and libdir. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/ruby_missing.h | 54 ++-------------------------------------------- 1 file changed, 2 insertions(+), 52 deletions(-) (limited to 'ext/openssl/ruby_missing.h') diff --git a/ext/openssl/ruby_missing.h b/ext/openssl/ruby_missing.h index bdb152b08e..f9e74f743e 100644 --- a/ext/openssl/ruby_missing.h +++ b/ext/openssl/ruby_missing.h @@ -11,60 +11,10 @@ #if !defined(_OSSL_RUBY_MISSING_H_) #define _OSS_RUBY_MISSING_H_ -#if !defined(StringValue) -# define StringValue(v) \ - if (TYPE(v) != T_STRING) v = rb_str_to_str(v) -#endif +#define DEFINE_ALLOC_WRAPPER(func) -#if !defined(StringValuePtr) -# define StringValuePtr(v) \ - RSTRING((TYPE(v) == T_STRING) ? (v) : rb_str_to_str(v))->ptr -#endif - -#if !defined(SafeStringValue) -# define SafeStringValue(v) do {\ - StringValue(v);\ - rb_check_safe_str(v);\ -} while (0) -#endif - -#if RUBY_VERSION_CODE < 180 -# define rb_cstr_to_inum(a,b,c) \ - rb_cstr2inum(a,b) -# define rb_check_frozen(obj) \ - if (OBJ_FROZEN(obj)) rb_error_frozen(rb_obj_classname(obj)) -# define rb_obj_classname(obj) \ - rb_class2name(CLASS_OF(obj)) -#endif - -#if HAVE_RB_DEFINE_ALLOC_FUNC -# define DEFINE_ALLOC_WRAPPER(func) -#else -# define DEFINE_ALLOC_WRAPPER(func) \ - static VALUE \ - func##_wrapper(int argc, VALUE *argv, VALUE klass) \ - { \ - VALUE obj; \ - \ - obj = func(klass); \ - \ - rb_obj_call_init(obj, argc, argv); \ - \ - return obj; \ - } -# define rb_define_alloc_func(klass, func) \ - rb_define_singleton_method(klass, "new", func##_wrapper, -1) -#endif - -#if RUBY_VERSION_CODE >= 180 -# if !defined(HAVE_RB_OBJ_INIT_COPY) -# define rb_define_copy_func(klass, func) \ - rb_define_method(klass, "copy_object", func, 1) -# else -# define rb_define_copy_func(klass, func) \ +#define rb_define_copy_func(klass, func) \ rb_define_method(klass, "initialize_copy", func, 1) -# endif -#endif #endif /* _OSS_RUBY_MISSING_H_ */ -- cgit v1.2.3