[前][次][番号順一覧][スレッド一覧]

ruby-changes:57510

From: d0 <ko1@a...>
Date: Tue, 3 Sep 2019 13:01:02 +0900 (JST)
Subject: [ruby-changes:57510] 355ccdeae5 (master): Disable method definition type checks on Cygwin too

https://git.ruby-lang.org/ruby.git/commit/?id=355ccdeae5

From 355ccdeae52cde250f09675e9d5e65b3ddc41f2e Mon Sep 17 00:00:00 2001
From: "d0 (Daisuke Fujimura)" <booleanlabel@g...>
Date: Tue, 3 Sep 2019 12:52:04 +0900
Subject: Disable method definition type checks on Cygwin too

[Bug #16134]

diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 1a17340..ed1a4cf 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -1003,7 +1003,7 @@ RUBY_SYMBOL_EXPORT_END https://github.com/ruby/ruby/blob/trunk/include/ruby/intern.h#L1003
 }  /* 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 652dcc3..0d7880b 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -2689,7 +2689,7 @@ RUBY_SYMBOL_EXPORT_END https://github.com/ruby/ruby/blob/trunk/include/ruby/ruby.h#L2689
 }  /* 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);
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]