ruby-changes:61191
From: =E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3 <ko1@a...>
Date: Mon, 11 May 2020 09:24:38 +0900 (JST)
Subject: [ruby-changes:61191] d7f4d732c1 (master): sed -i s|ruby/3|ruby/impl|g
https://git.ruby-lang.org/ruby.git/commit/?id=d7f4d732c1 From d7f4d732c199df24620a162372c71ee83ed21e62 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: Mon, 4 May 2020 15:35:26 +0900 Subject: sed -i s|ruby/3|ruby/impl|g This shall fix compile errors. diff --git a/addr2line.c b/addr2line.c index 4e67aec..56284bf 100644 --- a/addr2line.c +++ b/addr2line.c @@ -13,7 +13,7 @@ https://github.com/ruby/ruby/blob/trunk/addr2line.c#L13 #pragma clang diagnostic ignored "-Wgcc-compat" #endif -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include "ruby/defines.h" #include "ruby/missing.h" #include "addr2line.h" @@ -25,7 +25,7 @@ https://github.com/ruby/ruby/blob/trunk/addr2line.c#L25 #include <libproc.h> #endif -#include "ruby/3/stdbool.h" +#include "ruby/impl/stdbool.h" #if defined(USE_ELF) || defined(HAVE_MACH_O_LOADER_H) diff --git a/bignum.c b/bignum.c index 3e99e72..77d9b57 100644 --- a/bignum.c +++ b/bignum.c @@ -9,7 +9,7 @@ https://github.com/ruby/ruby/blob/trunk/bignum.c#L9 **********************************************************************/ -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include <ctype.h> #include <float.h> diff --git a/class.c b/class.c index c19de64..cb68037 100644 --- a/class.c +++ b/class.c @@ -23,7 +23,7 @@ https://github.com/ruby/ruby/blob/trunk/class.c#L23 * \{ */ -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include <ctype.h> #include "constant.h" diff --git a/common.mk b/common.mk index a6b1008..40533c6 100644 --- a/common.mk +++ b/common.mk @@ -1582,49 +1582,49 @@ help: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1582 $(MESSAGE_END) # AUTOGENERATED DEPENDENCIES START -addr2line.$(OBJEXT): {$(VPATH)}3/assume.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/alloc_size.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/cold.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/const.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/deprecated.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/error.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/forceinline.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/format.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/maybe_unused.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/nodiscard.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/noexcept.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/noinline.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/nonnull.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/noreturn.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/pure.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/restrict.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/returns_nonnull.h -addr2line.$(OBJEXT): {$(VPATH)}3/attr/warning.h -addr2line.$(OBJEXT): {$(VPATH)}3/cast.h -addr2line.$(OBJEXT): {$(VPATH)}3/compiler_is.h -addr2line.$(OBJEXT): {$(VPATH)}3/compiler_is/apple.h -addr2line.$(OBJEXT): {$(VPATH)}3/compiler_is/clang.h -addr2line.$(OBJEXT): {$(VPATH)}3/compiler_is/gcc.h -addr2line.$(OBJEXT): {$(VPATH)}3/compiler_is/intel.h -addr2line.$(OBJEXT): {$(VPATH)}3/compiler_is/msvc.h -addr2line.$(OBJEXT): {$(VPATH)}3/compiler_is/sunpro.h -addr2line.$(OBJEXT): {$(VPATH)}3/compiler_since.h -addr2line.$(OBJEXT): {$(VPATH)}3/config.h -addr2line.$(OBJEXT): {$(VPATH)}3/dllexport.h -addr2line.$(OBJEXT): {$(VPATH)}3/dosish.h -addr2line.$(OBJEXT): {$(VPATH)}3/has/attribute.h -addr2line.$(OBJEXT): {$(VPATH)}3/has/builtin.h -addr2line.$(OBJEXT): {$(VPATH)}3/has/c_attribute.h -addr2line.$(OBJEXT): {$(VPATH)}3/has/cpp_attribute.h -addr2line.$(OBJEXT): {$(VPATH)}3/has/declspec_attribute.h -addr2line.$(OBJEXT): {$(VPATH)}3/has/extension.h -addr2line.$(OBJEXT): {$(VPATH)}3/has/feature.h -addr2line.$(OBJEXT): {$(VPATH)}3/has/warning.h -addr2line.$(OBJEXT): {$(VPATH)}3/stdalign.h -addr2line.$(OBJEXT): {$(VPATH)}3/stdbool.h -addr2line.$(OBJEXT): {$(VPATH)}3/token_paste.h -addr2line.$(OBJEXT): {$(VPATH)}3/warning_push.h -addr2line.$(OBJEXT): {$(VPATH)}3/xmalloc.h +addr2line.$(OBJEXT): {$(VPATH)}impl/assume.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/alloc_size.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/cold.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/const.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/deprecated.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/error.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/forceinline.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/format.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/maybe_unused.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/nodiscard.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/noexcept.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/noinline.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/nonnull.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/noreturn.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/pure.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/restrict.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/returns_nonnull.h +addr2line.$(OBJEXT): {$(VPATH)}impl/attr/warning.h +addr2line.$(OBJEXT): {$(VPATH)}impl/cast.h +addr2line.$(OBJEXT): {$(VPATH)}impl/compiler_is.h +addr2line.$(OBJEXT): {$(VPATH)}impl/compiler_is/apple.h +addr2line.$(OBJEXT): {$(VPATH)}impl/compiler_is/clang.h +addr2line.$(OBJEXT): {$(VPATH)}impl/compiler_is/gcc.h +addr2line.$(OBJEXT): {$(VPATH)}impl/compiler_is/intel.h +addr2line.$(OBJEXT): {$(VPATH)}impl/compiler_is/msvc.h +addr2line.$(OBJEXT): {$(VPATH)}impl/compiler_is/sunpro.h +addr2line.$(OBJEXT): {$(VPATH)}impl/compiler_since.h +addr2line.$(OBJEXT): {$(VPATH)}impl/config.h +addr2line.$(OBJEXT): {$(VPATH)}impl/dllexport.h +addr2line.$(OBJEXT): {$(VPATH)}impl/dosish.h +addr2line.$(OBJEXT): {$(VPATH)}impl/has/attribute.h +addr2line.$(OBJEXT): {$(VPATH)}impl/has/builtin.h +addr2line.$(OBJEXT): {$(VPATH)}impl/has/c_attribute.h +addr2line.$(OBJEXT): {$(VPATH)}impl/has/cpp_attribute.h +addr2line.$(OBJEXT): {$(VPATH)}impl/has/declspec_attribute.h +addr2line.$(OBJEXT): {$(VPATH)}impl/has/extension.h +addr2line.$(OBJEXT): {$(VPATH)}impl/has/feature.h +addr2line.$(OBJEXT): {$(VPATH)}impl/has/warning.h +addr2line.$(OBJEXT): {$(VPATH)}impl/stdalign.h +addr2line.$(OBJEXT): {$(VPATH)}impl/stdbool.h +addr2line.$(OBJEXT): {$(VPATH)}impl/token_paste.h +addr2line.$(OBJEXT): {$(VPATH)}impl/warning_push.h +addr2line.$(OBJEXT): {$(VPATH)}impl/xmalloc.h addr2line.$(OBJEXT): {$(VPATH)}addr2line.c addr2line.$(OBJEXT): {$(VPATH)}addr2line.h addr2line.$(OBJEXT): {$(VPATH)}assert.h @@ -1658,146 +1658,146 @@ array.$(OBJEXT): $(top_srcdir)/internal/serial.h https://github.com/ruby/ruby/blob/trunk/common.mk#L1658 array.$(OBJEXT): $(top_srcdir)/internal/static_assert.h array.$(OBJEXT): $(top_srcdir)/internal/vm.h array.$(OBJEXT): $(top_srcdir)/internal/warnings.h -array.$(OBJEXT): {$(VPATH)}3/anyargs.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/char.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/double.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/fixnum.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/gid_t.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/int.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/intptr_t.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/long.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/long_long.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/mode_t.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/off_t.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/pid_t.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/short.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/size_t.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/st_data_t.h -array.$(OBJEXT): {$(VPATH)}3/arithmetic/uid_t.h -array.$(OBJEXT): {$(VPATH)}3/assume.h -array.$(OBJEXT): {$(VPATH)}3/attr/alloc_size.h -array.$(OBJEXT): {$(VPATH)}3/attr/artificial.h -array.$(OBJEXT): {$(VPATH)}3/attr/cold.h -array.$(OBJEXT): {$(VPATH)}3/attr/const.h -array.$(OBJEXT): {$(VPATH)}3/attr/constexpr.h -array.$(OBJEXT): {$(VPATH)}3/attr/deprecated.h -array.$(OBJEXT): {$(VPATH)}3/attr/diagnose_if.h -array.$(OBJEXT): {$(VPATH)}3/attr/enum_extensibility.h -array.$(OBJEXT): {$(VPATH)}3/attr/error.h -array.$(OBJEXT): {$(VPATH)}3/attr/flag_enum.h -array.$(OBJEXT): {$(VPATH)}3/attr/forceinline.h -array.$(OBJEXT): {$(VPATH)}3/attr/format.h -array.$(OBJEXT): {$(VPATH)}3/attr/maybe_unused.h -array.$(OBJEXT): {$(VPATH)}3/attr/noalias.h -array.$(OBJEXT): {$(VPATH)}3/attr/nodiscard.h -array.$(OBJEXT): {$(VPATH)}3/attr/noexcept.h -array.$(OBJEXT): {$(VPATH)}3/attr/noinline.h -array.$(OBJEXT): {$(VPATH)}3/attr/nonnull.h -array.$(OBJEXT): {$(VPATH)}3/attr/noreturn.h -array.$(OBJEXT): {$(VPATH)}3/attr/pure.h -array.$(OBJEXT): {$(VPATH)}3/attr/restrict.h -array.$(OBJEXT): {$(VPATH)}3/attr/returns_nonnull.h -array.$(OBJEXT): {$(VPATH)}3/attr/warning.h -array.$(OBJEXT): {$(VPATH)}3/attr/weakref.h -array.$(OBJEXT): {$(VPATH)}3/cast.h -array.$(OBJEXT): {$(VPATH)}3/compiler_is.h -array.$(OBJEXT): {$(VPATH)}3/compiler_is/apple.h -array.$(OBJEXT): {$(VPATH)}3/compiler_is/clang.h -array.$(OBJEXT): {$(VPATH)}3/compiler_is/gcc.h -array.$(OBJEXT): {$(VPATH)}3/compiler_is/intel.h -array.$(OBJEXT): {$(VPATH)}3/compiler_is/msvc.h -array.$(OBJEXT): {$(VPATH)}3/compiler_is/sunpro.h -array.$(OBJEXT): {$(VPATH)}3/compiler_since.h -array.$(OBJEXT): {$(VPATH)}3/config.h -array.$(OBJEXT): {$(VPATH)}3/constant_p.h -array.$(OBJEXT): {$(VPATH)}3/core.h -array.$(OBJEXT): {$(VPATH)}3/core/rarray.h -array.$(OBJEXT): {$(VPATH)}3/core/rbasic.h -array.$(OBJEXT): {$(VPATH)}3/core/rbignum.h -array.$(OBJEXT): {$(VPATH)}3/core/rclass.h -array.$(OBJEXT): {$(VPATH)}3/core/rdata.h -array.$(OBJEXT): {$(VPATH)}3/core/rfile.h -array.$(OBJEXT): {$(VPATH)}3/core/rhash.h -array.$(OBJEXT): {$(VPATH)}3/core/robject.h -array.$(OBJEXT): {$(VPATH)}3/core/rregexp.h -array.$(OBJEXT): {$(VPATH)}3/core/rstring.h -array.$(OBJEXT): {$(VPATH)}3/core/rstruct.h -array.$(OBJEXT): {$(VPATH)}3/core/rtypeddata.h -array.$(OBJEXT): {$(VPATH)}3/ctype.h -array.$(OBJEXT): {$(VPATH)}3/dllexport.h -array.$(OBJEXT): {$(VPATH)}3/dosish.h -array.$(OBJEXT): {$(VPATH)}3/error.h -array.$(OBJEXT): {$(VPATH)}3/eval.h -array.$(OBJEXT): {$(VPATH)}3/event.h -array.$(OBJEXT): {$(VPATH)}3/fl_type.h -array.$(OBJEXT): {$(VPATH)}3/gc.h -array.$(OBJEXT): {$(VPATH)}3/glob.h -array.$(OBJEXT): {$(VPATH)}3/globals.h -array.$(OBJEXT): {$(VPATH)}3/h (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/