diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-19 08:28:28 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-19 08:28:28 +0000 |
| commit | 4e6ad7d910a27b9bddc9e3616464885184875ab4 (patch) | |
| tree | dfdf0ac0093315a43c675f1b0f10fa63c61add33 | |
| parent | 49e685a0af54f3916542b4720da9b7e3f92e347d (diff) | |
| download | ruby-4e6ad7d910a27b9bddc9e3616464885184875ab4.tar.gz | |
* include/ruby/defines.h (RUBY_ALIAS_FUNCTION_TYPE): added.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | include/ruby/defines.h | 6 |
3 files changed, 7 insertions, 7 deletions
@@ -1,6 +1,6 @@ -Mon Jan 19 17:25:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Jan 19 17:29:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> - * include/ruby/defines.h (RUBY_ALIAS_FUNCTION2): added. + * include/ruby/defines.h (RUBY_ALIAS_FUNCTION_TYPE): added. Mon Jan 19 17:24:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> diff --git a/configure.in b/configure.in index 6f5a33695b..7a1970b401 100644 --- a/configure.in +++ b/configure.in @@ -473,10 +473,10 @@ if test "$GCC" = yes; then [rb_cv_gcc_function_alias=$a; break]) done]) if test "$rb_cv_gcc_function_alias" != no; then - AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION2(type, prot, name, args)], + AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args)], [type prot __attribute__(($rb_cv_gcc_function_alias(@%:@name)));]) AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)], - [RUBY_ALIAS_FUNCTION2(void, prot, name, args)]) + [RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)]) fi fi diff --git a/include/ruby/defines.h b/include/ruby/defines.h index 97806b7d0a..1a9b37e2c7 100644 --- a/include/ruby/defines.h +++ b/include/ruby/defines.h @@ -266,8 +266,8 @@ void rb_ia64_flushrs(void); #define RUBY_PLATFORM "unknown-unknown" #endif -#ifndef RUBY_ALIAS_FUNCTION2 -#define RUBY_ALIAS_FUNCTION2(type, prot, name, args) \ +#ifndef RUBY_ALIAS_FUNCTION_TYPE +#define RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args) \ type prot {return name args;} #endif #ifndef RUBY_ALIAS_FUNCTION_VOID @@ -276,7 +276,7 @@ void rb_ia64_flushrs(void); #endif #ifndef RUBY_ALIAS_FUNCTION #define RUBY_ALIAS_FUNCTION(prot, name, args) \ - RUBY_ALIAS_FUNCTION2(VALUE, prot, name, args) + RUBY_ALIAS_FUNCTION_TYPE(VALUE, prot, name, args) #endif #if defined(__cplusplus) |