summaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
author卜部昌平 <shyouhei@ruby-lang.org>2020-05-04 15:52:56 +0900
committer卜部昌平 <shyouhei@ruby-lang.org>2020-05-11 09:24:08 +0900
commit97672f669af53c41b094772559030195787406be (patch)
tree71902d58cda65825046cff5e42723dfa0d0280af /internal
parentd7f4d732c199df24620a162372c71ee83ed21e62 (diff)
sed -i s/RUBY3/RBIMPL/g
Devs do not love "3". The only exception is RUBY3_KEYWORDS in parse.y, which seems unrelated to our interests.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3079
Diffstat (limited to 'internal')
-rw-r--r--internal/array.h2
-rw-r--r--internal/compilers.h16
-rw-r--r--internal/process.h2
-rw-r--r--internal/sanitizers.h2
-rw-r--r--internal/static_assert.h2
-rw-r--r--internal/warnings.h8
6 files changed, 16 insertions, 16 deletions
diff --git a/internal/array.h b/internal/array.h
index 97735d38eb..1ab5753740 100644
--- a/internal/array.h
+++ b/internal/array.h
@@ -87,7 +87,7 @@ RARY_TRANSIENT_UNSET(VALUE ary)
}
#undef rb_ary_new_from_args
-#if RUBY3_HAS_WARNING("-Wgnu-zero-variadic-macro-arguments")
+#if RBIMPL_HAS_WARNING("-Wgnu-zero-variadic-macro-arguments")
# /* Skip it; clang -pedantic doesn't like the following */
#elif defined(__GNUC__) && defined(HAVE_VA_ARGS_MACRO)
#define rb_ary_new_from_args(n, ...) \
diff --git a/internal/compilers.h b/internal/compilers.h
index f5b5f8b70d..6b084b906f 100644
--- a/internal/compilers.h
+++ b/internal/compilers.h
@@ -19,11 +19,11 @@
#include "ruby/impl/has/warning.h"
#include "ruby/backward/2/gcc_version_since.h"
-#define MSC_VERSION_SINCE(_) RUBY3_COMPILER_SINCE(MSVC, (_) / 100, (_) % 100, 0)
-#define MSC_VERSION_BEFORE(_) RUBY3_COMPILER_BEFORE(MSVC, (_) / 100, (_) % 100, 0)
+#define MSC_VERSION_SINCE(_) RBIMPL_COMPILER_SINCE(MSVC, (_) / 100, (_) % 100, 0)
+#define MSC_VERSION_BEFORE(_) RBIMPL_COMPILER_BEFORE(MSVC, (_) / 100, (_) % 100, 0)
#ifndef __has_attribute
-# define __has_attribute(...) RUBY3_HAS_ATTRIBUTE(__VA_ARGS__)
+# define __has_attribute(...) RBIMPL_HAS_ATTRIBUTE(__VA_ARGS__)
#endif
#ifndef __has_c_attribute
@@ -33,23 +33,23 @@
#endif
#ifndef __has_declspec_attribute
-# define __has_declspec_attribute(...) RUBY3_HAS_DECLSPEC_ATTRIBUTE(__VA_ARGS__)
+# define __has_declspec_attribute(...) RBIMPL_HAS_DECLSPEC_ATTRIBUTE(__VA_ARGS__)
#endif
#ifndef __has_builtin
-# define __has_builtin(...) RUBY3_HAS_BUILTIN(__VA_ARGS__)
+# define __has_builtin(...) RBIMPL_HAS_BUILTIN(__VA_ARGS__)
#endif
#ifndef __has_feature
-# define __has_feature(...) RUBY3_HAS_FEATURE(__VA_ARGS__)
+# define __has_feature(...) RBIMPL_HAS_FEATURE(__VA_ARGS__)
#endif
#ifndef __has_extension
-# define __has_extension(...) RUBY3_HAS_EXTENSION(__VA_ARGS__)
+# define __has_extension(...) RBIMPL_HAS_EXTENSION(__VA_ARGS__)
#endif
#ifndef __has_warning
-# define __has_warning(...) RUBY3_HAS_WARNING(__VA_ARGS__)
+# define __has_warning(...) RBIMPL_HAS_WARNING(__VA_ARGS__)
#endif
#ifndef __GNUC__
diff --git a/internal/process.h b/internal/process.h
index b5b3c9462f..bfedbc47aa 100644
--- a/internal/process.h
+++ b/internal/process.h
@@ -116,7 +116,7 @@ ARGVSTR2ARGC(VALUE argv_str)
#ifdef HAVE_WORKING_FORK
COMPILER_WARNING_PUSH
-#if __has_warning("-Wdeprecated-declarations") || RUBY3_COMPILER_IS(GCC)
+#if __has_warning("-Wdeprecated-declarations") || RBIMPL_COMPILER_IS(GCC)
COMPILER_WARNING_IGNORED(-Wdeprecated-declarations)
#endif
static inline rb_pid_t
diff --git a/internal/sanitizers.h b/internal/sanitizers.h
index d54306250c..270d62cf23 100644
--- a/internal/sanitizers.h
+++ b/internal/sanitizers.h
@@ -46,7 +46,7 @@
# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) x
#endif
-#if defined(NO_SANITIZE) && RUBY3_COMPILER_IS(GCC)
+#if defined(NO_SANITIZE) && RBIMPL_COMPILER_IS(GCC)
/* GCC warns about unknown sanitizer, which is annoying. */
# include "internal/warnings.h"
# undef NO_SANITIZE
diff --git a/internal/static_assert.h b/internal/static_assert.h
index b7abc07b09..bad55844e7 100644
--- a/internal/static_assert.h
+++ b/internal/static_assert.h
@@ -11,7 +11,7 @@
*/
#include "ruby/impl/static_assert.h"
#ifndef STATIC_ASSERT
-# define STATIC_ASSERT RUBY3_STATIC_ASSERT
+# define STATIC_ASSERT RBIMPL_STATIC_ASSERT
#endif
#endif /* INTERNAL_STATIC_ASSERT_H */
diff --git a/internal/warnings.h b/internal/warnings.h
index 9a8017997b..da9ca440e7 100644
--- a/internal/warnings.h
+++ b/internal/warnings.h
@@ -10,8 +10,8 @@
* @brief Internal header to suppres / mandate warnings.
*/
#include "ruby/impl/warning_push.h"
-#define COMPILER_WARNING_PUSH RUBY3_WARNING_PUSH()
-#define COMPILER_WARNING_POP RUBY3_WARNING_POP()
-#define COMPILER_WARNING_ERROR(flag) RUBY3_WARNING_ERROR(flag)
-#define COMPILER_WARNING_IGNORED(flag) RUBY3_WARNING_IGNORED(flag)
+#define COMPILER_WARNING_PUSH RBIMPL_WARNING_PUSH()
+#define COMPILER_WARNING_POP RBIMPL_WARNING_POP()
+#define COMPILER_WARNING_ERROR(flag) RBIMPL_WARNING_ERROR(flag)
+#define COMPILER_WARNING_IGNORED(flag) RBIMPL_WARNING_IGNORED(flag)
#endif /* INTERNAL_WARNINGS_H */