summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author卜部昌平 <[email protected]>2019-12-04 10:55:55 +0900
committer卜部昌平 <[email protected]>2019-12-26 20:45:12 +0900
commit1dd149d3b1e46f21b0c358fdf205e97ac009bb40 ()
tree93baad2b7a2499b3f3b49a9e67e6a6e899b49de9
parentb739a63eb41f52d33c33f87ebc44dcf89762cc37 (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: Merged: https://.com/ruby/ruby/pull/2711
-rw-r--r--include/ruby/encoding.h4
-rw-r--r--include/ruby/io.h4
-rw-r--r--internal.h2
3 files changed, 2 insertions, 8 deletions
@@ -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
@@ -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
@@ -21,6 +21,8 @@ extern "C" {
#endif
#endif
#include "internal/stdbool.h"
#include "internal/bits.h"