[前][次][番号順一覧][スレッド一覧]

ruby-changes:59514

From: =E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3 <ko1@a...>
Date: Fri, 27 Dec 2019 08:33:35 +0900 (JST)
Subject: [ruby-changes:59514] 1dd149d3b1 (master): re-add io.h and encoding.h into internal.h

https://git.ruby-lang.org/ruby.git/commit/?id=1dd149d3b1

From 1dd149d3b1e46f21b0c358fdf205e97ac009bb40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?=
 <shyouhei@r...>
Date: Wed, 4 Dec 2019 10:55:55 +0900
Subject: 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.

diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 93939ee..7ba7974 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -12,10 +12,6 @@ https://github.com/ruby/ruby/blob/trunk/include/ruby/encoding.h#L12
 #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 152f4ef..7d7b1a0 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -12,10 +12,6 @@ https://github.com/ruby/ruby/blob/trunk/include/ruby/io.h#L12
 #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 853274e..5b7f87a 100644
--- a/internal.h
+++ b/internal.h
@@ -21,6 +21,8 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/internal.h#L21
 #endif
 #endif
 
+#include "ruby/encoding.h"
+#include "ruby/io.h"
 #include "internal/stdbool.h"
 #include "internal/bits.h"
 
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]