summaryrefslogtreecommitdiff
path: root/gc.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-28 18:16:04 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-28 18:16:04 +0000
commit95bfac2e21ea3acb3903d05ff3909028af4a340f (patch)
tree8435ae96827b9433c9794aa769500c773809cff8 /gc.c
parentaad72320354dd5893e49b91952789c5163beb6b2 (diff)
merge revision(s) 51242: [Backport #11343]
* gc.c (__has_feature): move into internal.h. * internal.h (__has_feature): ditto. * internal.h (__has_extension): new macro. * internal.h (STATIC_ASSERT): use _Static_assert with clang. [ruby-core:69931] [Bug #11343] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/gc.c b/gc.c
index b843e7bb73..295d24d2f3 100644
--- a/gc.c
+++ b/gc.c
@@ -32,10 +32,6 @@
#undef rb_data_object_alloc
-#ifndef __has_feature
-# define __has_feature(x) 0
-#endif
-
#ifndef HAVE_MALLOC_USABLE_SIZE
# ifdef _WIN32
# define HAVE_MALLOC_USABLE_SIZE