diff options
| author | 卜部昌平 <shyouhei@ruby-lang.org> | 2019-08-29 15:47:33 +0900 |
|---|---|---|
| committer | 卜部昌平 <shyouhei@ruby-lang.org> | 2019-08-29 18:34:09 +0900 |
| commit | e4be2fda3dbbfdb1f2ace697c96cf6bdd7dfef21 (patch) | |
| tree | 8cfce2c03e0b0c924a5a633c74b0a78f5ffc8d4a /include | |
| parent | 3df37259d81d9fc71f8b4f0b8d45dc9d0af81ab4 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/intern.h | 15 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 12 |
2 files changed, 27 insertions, 0 deletions
diff --git a/include/ruby/intern.h b/include/ruby/intern.h index f53864dcca..d9ea79da9b 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -1171,4 +1171,19 @@ __attribute__((__unused__,__weakref__("rb_define_singleton_method"),__nonnull__( #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 61fb3b0b89..29f7f1fd0f 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2818,4 +2818,16 @@ __attribute__((__unused__,__weakref__("rb_define_global_function"),__nonnull__(1 #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 */ |