From 355ccdeae52cde250f09675e9d5e65b3ddc41f2e Mon Sep 17 00:00:00 2001 From: "d0 (Daisuke Fujimura)" Date: Tue, 3 Sep 2019 12:52:04 +0900 Subject: [PATCH] Disable method definition type checks on Cygwin too [Bug #16134] --- include/ruby/intern.h | 2 +- include/ruby/ruby.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 1a17340c00..ed1a4cfdd5 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -1003,7 +1003,7 @@ RUBY_SYMBOL_EXPORT_END } /* extern "C" { */ #endif -#if defined(__has_attribute) && defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) && !defined(_WIN32) +#if defined(__has_attribute) && defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) && !defined(_WIN32) && !defined(__CYGWIN__) #if __has_attribute(transparent_union) && __has_attribute(unused) && __has_attribute(weakref) && __has_attribute(nonnull) __attribute__((__unused__,__weakref__("rb_define_method_id"),__nonnull__(3)))static void rb_define_method_idm3(VALUE,ID,VALUE(*)(ANYARGS),int); __attribute__((__unused__,__weakref__("rb_define_method_id"),__nonnull__(3)))static void rb_define_method_idm2(VALUE,ID,VALUE(*)(VALUE,VALUE),int); diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 652dcc30de..0d7880b349 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2689,7 +2689,7 @@ RUBY_SYMBOL_EXPORT_END } /* extern "C" { */ #endif -#if defined(__has_attribute) && defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) && !defined(_WIN32) +#if defined(__has_attribute) && defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) && !defined(_WIN32) && !defined(__CYGWIN__) #if __has_attribute(transparent_union) && __has_attribute(unused) && __has_attribute(weakref) && __has_attribute(nonnull) __attribute__((__unused__,__weakref__("rb_define_method"),__nonnull__(2,3)))static void rb_define_methodm3(VALUE,const char*,VALUE(*)(ANYARGS),int); __attribute__((__unused__,__weakref__("rb_define_method"),__nonnull__(2,3)))static void rb_define_methodm2(VALUE,const char*,VALUE(*)(VALUE,VALUE),int);