Fix header includes

Author: soutaro

ext/rbs_extension/ast_translation.h

@@ -8,8 +8,12 @@
 #ifndef RBS_EXTENSION_AST_TRANSLATION_H
 #define RBS_EXTENSION_AST_TRANSLATION_H
 
+#include "compat.h"
+
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_BEGIN
 #include "ruby.h"
 #include "ruby/encoding.h"
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_END
 
 #include "rbs/ast.h"
 #include "rbs/location.h"

ext/rbs_extension/class_constants.h

@@ -8,7 +8,11 @@
 #ifndef RBS__CONSTANTS_H
 #define RBS__CONSTANTS_H
 
+#include "compat.h"
+
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_BEGIN
 #include "ruby.h"
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_END
 
 extern VALUE RBS;
 

ext/rbs_extension/compat.h

@@ -0,0 +1,10 @@
+#ifdef __clang__
+#define SUPPRESS_RUBY_HEADER_DIAGNOSTICS_BEGIN \
+  _Pragma("clang diagnostic push")        \
+  _Pragma("clang diagnostic ignored \"-Wc2x-extensions\"")
+#define SUPPRESS_RUBY_HEADER_DIAGNOSTICS_END \
+  _Pragma("clang diagnostic pop")
+#else
+#define SUPPRESS_RUBY_HEADER_DIAGNOSTICS_BEGIN
+#define SUPPRESS_RUBY_HEADER_DIAGNOSTICS_END
+#endif

ext/rbs_extension/legacy_location.h

@@ -1,7 +1,12 @@
 #ifndef RBS_LOCATION_H
 #define RBS_LOCATION_H
 
+#include "compat.h"
+
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_BEGIN
 #include "ruby.h"
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_END
+
 #include "rbs.h"
 
 /**

ext/rbs_extension/rbs_extension.h

@@ -1,8 +1,11 @@
 #include <stdbool.h>
+#include "compat.h"
 
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_BEGIN
 #include "ruby.h"
 #include "ruby/re.h"
 #include "ruby/encoding.h"
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_END
 
 #include "class_constants.h"
 #include "rbs.h"

ext/rbs_extension/rbs_string_bridging.h

@@ -1,8 +1,12 @@
 #ifndef RBS__RBS_STRING_BRIDGING_H
 #define RBS__RBS_STRING_BRIDGING_H
 
+#include "compat.h"
+
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_BEGIN
 #include "ruby.h"
 #include "ruby/encoding.h"
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_END
 
 #include "rbs/string.h"
 

templates/ext/rbs_extension/ast_translation.h.erb

@@ -1,8 +1,12 @@
 #ifndef RBS_EXTENSION_AST_TRANSLATION_H
 #define RBS_EXTENSION_AST_TRANSLATION_H
 
+#include "compat.h"
+
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_BEGIN
 #include "ruby.h"
 #include "ruby/encoding.h"
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_END
 
 #include "rbs/ast.h"
 #include "rbs/location.h"

templates/ext/rbs_extension/class_constants.h.erb

@@ -1,7 +1,11 @@
 #ifndef RBS__CONSTANTS_H
 #define RBS__CONSTANTS_H
 
+#include "compat.h"
+
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_BEGIN
 #include "ruby.h"
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_END
 
 extern VALUE RBS;