summaryrefslogtreecommitdiff
path: root/internal/vm.h
diff options
context:
space:
mode:
author卜部昌平 <shyouhei@ruby-lang.org>2019-12-04 17:16:30 +0900
committer卜部昌平 <shyouhei@ruby-lang.org>2019-12-26 20:45:12 +0900
commit5e22f873ed26092522f9bfc617d729bac88b284f (patch)
tree8d66856526cd7efa87b46c966298e6f42d67e68f /internal/vm.h
parent33e9601938a79dae149caa88ff1bc06d376dd376 (diff)
decouple internal.h headers
Saves comitters' daily life by avoid #include-ing everything from internal.h to make each file do so instead. This would significantly speed up incremental builds. We take the following inclusion order in this changeset: 1. "ruby/config.h", where _GNU_SOURCE is defined (must be the very first thing among everything). 2. RUBY_EXTCONF_H if any. 3. Standard C headers, sorted alphabetically. 4. Other system headers, maybe guarded by #ifdef 5. Everything else, sorted alphabetically. Exceptions are those win32-related headers, which tend not be self- containing (headers have inclusion order dependencies).
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/2711
Diffstat (limited to 'internal/vm.h')
-rw-r--r--internal/vm.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/internal/vm.h b/internal/vm.h
index e9d2d09c6c..1bd7a98f7a 100644
--- a/internal/vm.h
+++ b/internal/vm.h
@@ -15,6 +15,14 @@
#include "ruby/ruby.h" /* for ID */
#include "ruby/st.h" /* for st_table */
+#ifdef rb_funcallv
+# undef rb_funcallv
+#endif
+
+#ifdef rb_method_basic_definition_p
+# undef rb_method_basic_definition_p
+#endif
+
/* I have several reasons to choose 64 here:
*
* - A cache line must be a power-of-two size.