diff options
author | 卜部昌平 <shyouhei@ruby-lang.org> | 2019-12-04 10:55:55 +0900 |
---|---|---|
committer | 卜部昌平 <shyouhei@ruby-lang.org> | 2019-12-26 20:45:12 +0900 |
commit | 1dd149d3b1e46f21b0c358fdf205e97ac009bb40 (patch) | |
tree | 93baad2b7a2499b3f3b49a9e67e6a6e899b49de9 | |
parent | b739a63eb41f52d33c33f87ebc44dcf89762cc37 (diff) |
re-add io.h and encoding.h into internal.h
This is tentative. For the sake of simplicity we partially revert
commits e9cb552ec96, ee85a6e72b and 51edb300425. Will decouple them
once again when we are ready.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2711
-rw-r--r-- | include/ruby/encoding.h | 4 | ||||
-rw-r--r-- | include/ruby/io.h | 4 | ||||
-rw-r--r-- | internal.h | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 93939ee7db..7ba7974265 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -12,10 +12,6 @@ #ifndef RUBY_ENCODING_H #define RUBY_ENCODING_H 1 -#ifdef RUBY_INTERNAL_H -#error "Include this file before internal.h" -#endif - #if defined(__cplusplus) extern "C" { #if 0 diff --git a/include/ruby/io.h b/include/ruby/io.h index 152f4ef763..7d7b1a0f01 100644 --- a/include/ruby/io.h +++ b/include/ruby/io.h @@ -12,10 +12,6 @@ #ifndef RUBY_IO_H #define RUBY_IO_H 1 -#ifdef RUBY_INTERNAL_H -#error "Include this file before internal.h" -#endif - #if defined(__cplusplus) extern "C" { #if 0 diff --git a/internal.h b/internal.h index 853274ec4a..5b7f87ae8d 100644 --- a/internal.h +++ b/internal.h @@ -21,6 +21,8 @@ extern "C" { #endif #endif +#include "ruby/encoding.h" +#include "ruby/io.h" #include "internal/stdbool.h" #include "internal/bits.h" |