ruby-changes:57373
From: =E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3 <ko1@a...>
Date: Thu, 29 Aug 2019 18:43:52 +0900 (JST)
Subject: [ruby-changes:57373] 卜部昌平: e4be2fda3d (master): Rule out gcc on Windows
https://git.ruby-lang.org/ruby.git/commit/?id=e4be2fda3d From e4be2fda3dbbfdb1f2ace697c96cf6bdd7dfef21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= <shyouhei@r...> Date: Thu, 29 Aug 2019 15:47:33 +0900 Subject: Rule out gcc on Windows It seems the combination fails at the moment. Don't know exactly why but I suspect there can be issues in resolving weak references. Let's rule them out for now. https://ci.appveyor.com/project/ruby/ruby/builds/27036383/job/x3c5d54839aacoyt diff --git a/include/ruby/intern.h b/include/ruby/intern.h index f53864d..d9ea79d 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -1171,4 +1171,19 @@ __attribute__((__unused__,__weakref__("rb_define_singleton_method"),__nonnull__( https://github.com/ruby/ruby/blob/trunk/include/ruby/intern.h#L1171 #endif #endif +#ifdef _WIN32 +#ifdef rb_define_method_id +#undef rb_define_method_id +#endif +#ifdef rb_define_private_function +#undef rb_define_private_function +#endif +#ifdef rb_define_protected_function +#undef rb_define_protected_function +#endif +#ifdef rb_define_singleton_function +#undef rb_define_singleton_function +#endif +#endif + #endif /* RUBY_INTERN_H */ diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 61fb3b0..29f7f1f 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2818,4 +2818,16 @@ __attribute__((__unused__,__weakref__("rb_define_global_function"),__nonnull__(1 https://github.com/ruby/ruby/blob/trunk/include/ruby/ruby.h#L2818 #endif #endif +#ifdef _WIN32 +#ifdef rb_define_method +#undef rb_define_method +#endif +#ifdef rb_define_module_function +#undef rb_define_module_function +#endif +#ifdef rb_define_global_function +#undef rb_define_global_function +#endif +#endif + #endif /* RUBY_RUBY_H */ -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/