From dc51d89ac22acc60b9bfeed87115863565b74085 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Fri, 22 Jan 2021 18:38:53 +0900
Subject: Minimize the changes in #5277

Instead of including `mruby/presym.h` everywhere, we provided the
fallback `mruby/presym.inc` under `include/mruby` directory, and specify
`-I<build-dir>/include` before `-I<top-dir>/include` in `presym.rake`.
So even when someone drops `-I<build-dir>/include` in compiler options,
it just compiles without failure.
---
 src/backtrace.c | 1 -
 src/class.c     | 1 -
 src/dump.c      | 5 +----
 src/error.c     | 1 -
 src/gc.c        | 1 -
 src/hash.c      | 1 -
 src/kernel.c    | 1 -
 src/numeric.c   | 1 -
 src/object.c    | 1 -
 src/print.c     | 1 -
 src/proc.c      | 1 -
 src/range.c     | 1 -
 src/string.c    | 1 -
 src/symbol.c    | 1 -
 src/variable.c  | 1 -
 src/vm.c        | 1 -
 16 files changed, 1 insertion(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/backtrace.c b/src/backtrace.c
index a829d5cf1..508fe99e9 100644
--- a/src/backtrace.c
+++ b/src/backtrace.c
@@ -14,7 +14,6 @@
 #include <mruby/error.h>
 #include <mruby/numeric.h>
 #include <mruby/data.h>
-#include <mruby/presym.h>
 
 struct backtrace_location {
   int32_t lineno;
diff --git a/src/class.c b/src/class.c
index 126ac0004..287d63da3 100644
--- a/src/class.c
+++ b/src/class.c
@@ -17,7 +17,6 @@
 #include <mruby/data.h>
 #include <mruby/istruct.h>
 #include <mruby/opcode.h>
-#include <mruby/presym.h>
 
 union mt_ptr {
   struct RProc *proc;
diff --git a/src/dump.c b/src/dump.c
index dcd94fd45..10b6d9dec 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -1216,10 +1216,7 @@ mrb_dump_irep_cstruct(mrb_state *mrb, const mrb_irep *irep, uint8_t flags, FILE
   if (fp == NULL || initname == NULL || initname[0] == '\0') {
     return MRB_DUMP_INVALID_ARGUMENT;
   }
-  if (fprintf(fp, "#include <mruby.h>\n"
-                  "#include <mruby/proc.h>\n"
-                  "#include <mruby/presym.h>\n"
-                  "\n") < 0) {
+  if (fprintf(fp, "#include <mruby.h>\n" "#include <mruby/proc.h>\n\n") < 0) {
     return MRB_DUMP_WRITE_FAULT;
   }
   fputs("#define mrb_BRACED(...) {__VA_ARGS__}\n", fp);
diff --git a/src/error.c b/src/error.c
index d2f1c27ac..4f7ca8641 100644
--- a/src/error.c
+++ b/src/error.c
@@ -16,7 +16,6 @@
 #include <mruby/error.h>
 #include <mruby/class.h>
 #include <mruby/throw.h>
-#include <mruby/presym.h>
 
 MRB_API mrb_value
 mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, size_t len)
diff --git a/src/gc.c b/src/gc.c
index 98a2237d5..5943a0e3b 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -22,7 +22,6 @@
 #include <mruby/gc.h>
 #include <mruby/error.h>
 #include <mruby/throw.h>
-#include <mruby/presym.h>
 
 /*
   = Tri-color Incremental Garbage Collection
diff --git a/src/hash.c b/src/hash.c
index 289f02a91..3c9c2f484 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -11,7 +11,6 @@
 #include <mruby/hash.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
-#include <mruby/presym.h>
 
 /*
  * === Glossary
diff --git a/src/kernel.c b/src/kernel.c
index 05d7c7c84..36ed0c121 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -13,7 +13,6 @@
 #include <mruby/variable.h>
 #include <mruby/error.h>
 #include <mruby/istruct.h>
-#include <mruby/presym.h>
 
 MRB_API mrb_bool
 mrb_func_basic_p(mrb_state *mrb, mrb_value obj, mrb_sym mid, mrb_func_t func)
diff --git a/src/numeric.c b/src/numeric.c
index cef6fac96..59136bece 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -17,7 +17,6 @@
 #include <mruby/numeric.h>
 #include <mruby/string.h>
 #include <mruby/class.h>
-#include <mruby/presym.h>
 
 #ifndef MRB_NO_FLOAT
 #ifdef MRB_USE_FLOAT32
diff --git a/src/object.c b/src/object.c
index d6474ae97..bf4d743ff 100644
--- a/src/object.c
+++ b/src/object.c
@@ -9,7 +9,6 @@
 #include <mruby/numeric.h>
 #include <mruby/string.h>
 #include <mruby/class.h>
-#include <mruby/presym.h>
 
 MRB_API mrb_bool
 mrb_obj_eq(mrb_state *mrb, mrb_value v1, mrb_value v2)
diff --git a/src/print.c b/src/print.c
index 607eb9d1f..68b2aad91 100644
--- a/src/print.c
+++ b/src/print.c
@@ -8,7 +8,6 @@
 #include <mruby/string.h>
 #include <mruby/variable.h>
 #include <mruby/error.h>
-#include <mruby/presym.h>
 #include <string.h>
 
 #ifndef MRB_NO_STDIO
diff --git a/src/proc.c b/src/proc.c
index 870d5ea16..72d7ad120 100644
--- a/src/proc.c
+++ b/src/proc.c
@@ -9,7 +9,6 @@
 #include <mruby/proc.h>
 #include <mruby/opcode.h>
 #include <mruby/data.h>
-#include <mruby/presym.h>
 
 static const mrb_code call_iseq[] = {
   OP_CALL,
diff --git a/src/range.c b/src/range.c
index a109257c0..f3f02a010 100644
--- a/src/range.c
+++ b/src/range.c
@@ -9,7 +9,6 @@
 #include <mruby/range.h>
 #include <mruby/string.h>
 #include <mruby/array.h>
-#include <mruby/presym.h>
 
 #define RANGE_INITIALIZED_MASK 1
 #define RANGE_INITIALIZED(p) ((p)->flags |= RANGE_INITIALIZED_MASK)
diff --git a/src/string.c b/src/string.c
index eb4136b10..83401b3db 100644
--- a/src/string.c
+++ b/src/string.c
@@ -22,7 +22,6 @@
 #include <mruby/range.h>
 #include <mruby/string.h>
 #include <mruby/numeric.h>
-#include <mruby/presym.h>
 
 typedef struct mrb_shared_string {
   int refcnt;
diff --git a/src/symbol.c b/src/symbol.c
index e9afc1dd7..773e980e5 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -11,7 +11,6 @@
 #include <mruby/string.h>
 #include <mruby/dump.h>
 #include <mruby/class.h>
-#include <mruby/presym.h>
 
 #ifndef MRB_NO_PRESYM
 
diff --git a/src/variable.c b/src/variable.c
index d5a7d90c7..9343a2bf5 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -10,7 +10,6 @@
 #include <mruby/proc.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
-#include <mruby/presym.h>
 
 struct iv_elem {
   mrb_sym key;
diff --git a/src/vm.c b/src/vm.c
index 17d506a34..3ea594250 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -24,7 +24,6 @@
 #include "value_array.h"
 #include <mruby/throw.h>
 #include <mruby/dump.h>
-#include <mruby/presym.h>
 
 #ifdef MRB_NO_STDIO
 #if defined(__cplusplus)
-- 
cgit v1.2.3