From 290e26c729a083f4461d2497099d9e7eee814228 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 6 Mar 2023 22:03:39 -0800 Subject: Remove obsoleted MJIT_HEADER macro --- include/ruby/backward/2/attributes.h | 6 ++---- include/ruby/internal/dllexport.h | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/ruby/backward/2/attributes.h b/include/ruby/backward/2/attributes.h index 7a1ea6b758..916d9e9d5b 100644 --- a/include/ruby/backward/2/attributes.h +++ b/include/ruby/backward/2/attributes.h @@ -81,10 +81,8 @@ #undef NOINLINE #define NOINLINE(x) RBIMPL_ATTR_NOINLINE() x -#ifndef MJIT_HEADER -# undef ALWAYS_INLINE -# define ALWAYS_INLINE(x) RBIMPL_ATTR_FORCEINLINE() x -#endif +#undef ALWAYS_INLINE +#define ALWAYS_INLINE(x) RBIMPL_ATTR_FORCEINLINE() x #undef ERRORFUNC #define ERRORFUNC(mesg, x) RBIMPL_ATTR_ERROR(mesg) x diff --git a/include/ruby/internal/dllexport.h b/include/ruby/internal/dllexport.h index 7f152441a9..71026e7100 100644 --- a/include/ruby/internal/dllexport.h +++ b/include/ruby/internal/dllexport.h @@ -37,9 +37,7 @@ * ``` */ #undef RUBY_EXTERN -#if defined(MJIT_HEADER) && defined(_WIN32) -# define RUBY_EXTERN extern __declspec(dllimport) -#elif defined(RUBY_EXPORT) +#if defined(RUBY_EXPORT) # define RUBY_EXTERN extern #elif defined(_WIN32) # define RUBY_EXTERN extern __declspec(dllimport) -- cgit v1.2.1