From b2398879fa4d40f65703ca819d012af4a000bbb2 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Thu, 25 Jun 2020 11:31:24 +0900
Subject: Avoid including `limits.h` and `stdint.h` before `mruby.h`.

They are included from `mruby.h` anyway, and including it ahead can
cause some errors regarding `INT32_MAX` etc. with C++ compiler.
---
 benchmark/build_config_boxing.rb      | 28 ----------------------------
 mrbgems/mruby-compiler/core/codegen.c |  2 --
 target/boxing.rb                      | 28 ++++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 30 deletions(-)
 delete mode 100644 benchmark/build_config_boxing.rb
 create mode 100644 target/boxing.rb

diff --git a/benchmark/build_config_boxing.rb b/benchmark/build_config_boxing.rb
deleted file mode 100644
index b478c9005..000000000
--- a/benchmark/build_config_boxing.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-MRuby::Build.new do |conf|
-  toolchain :gcc
-end
-
-MRuby::Build.new('no_boxing') do |conf|
-  toolchain :gcc
-
-  conf.gembox 'default'
-end
-
-MRuby::Build.new('word_boxing') do |conf|
-  toolchain :gcc
-
-  conf.gembox 'default'
-  conf.compilers.each do |c|
-    c.defines += %w(MRB_WORD_BOXING)
-  end
-end
-
-MRuby::Build.new('nan_boxing') do |conf|
-  toolchain :gcc
-
-  conf.gembox 'default'
-  conf.compilers.each do |c|
-    c.defines += %w(MRB_NAN_BOXING)
-  end
-end
-
diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c
index 14b53d073..189bb95b8 100644
--- a/mrbgems/mruby-compiler/core/codegen.c
+++ b/mrbgems/mruby-compiler/core/codegen.c
@@ -5,8 +5,6 @@
 */
 
 #include <ctype.h>
-#include <limits.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
diff --git a/target/boxing.rb b/target/boxing.rb
new file mode 100644
index 000000000..b478c9005
--- /dev/null
+++ b/target/boxing.rb
@@ -0,0 +1,28 @@
+MRuby::Build.new do |conf|
+  toolchain :gcc
+end
+
+MRuby::Build.new('no_boxing') do |conf|
+  toolchain :gcc
+
+  conf.gembox 'default'
+end
+
+MRuby::Build.new('word_boxing') do |conf|
+  toolchain :gcc
+
+  conf.gembox 'default'
+  conf.compilers.each do |c|
+    c.defines += %w(MRB_WORD_BOXING)
+  end
+end
+
+MRuby::Build.new('nan_boxing') do |conf|
+  toolchain :gcc
+
+  conf.gembox 'default'
+  conf.compilers.each do |c|
+    c.defines += %w(MRB_NAN_BOXING)
+  end
+end
+
-- 
cgit v1.2.3