From f62a2fd1eb8b44d0471f0e36febf0de2489e5b74 Mon Sep 17 00:00:00 2001 From: ngoto Date: Tue, 16 Jan 2018 05:49:01 +0000 Subject: fix macro argument names inconsistency * include/ruby/defines.h (RUBY_ALIGNAS): Fix macro definition. Fix compile error with Fujitsu C Compiler (fcc) on Solaris. * include/ruby/defines.h (RUBY_ALIGNOF): Fix macro argument name. Fix compile error with fcc and Oracle Solaris Studio 12.4 on Solaris. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/defines.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/ruby/defines.h b/include/ruby/defines.h index 9a2cd34caf..5006305059 100644 --- a/include/ruby/defines.h +++ b/include/ruby/defines.h @@ -373,7 +373,7 @@ void rb_ia64_flushrs(void); #endif #ifndef RUBY_ALIGNAS -#define RUBY_ALIGNAS(x) y +#define RUBY_ALIGNAS(x) /* x */ #endif #ifdef RUBY_ALIGNOF @@ -383,7 +383,7 @@ void rb_ia64_flushrs(void); #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) #define RUBY_ALIGNOF _Alignof #else -#define RUBY_ALIGNOF(x) ((size_t)offsetof(struct { char f1; type f2; }, f2)) +#define RUBY_ALIGNOF(type) ((size_t)offsetof(struct { char f1; type f2; }, f2)) #endif #define NORETURN_STYLE_NEW 1 -- cgit v1.2.3