diff options
| author | ttate <ttate@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-06 19:59:31 +0000 |
|---|---|---|
| committer | ttate <ttate@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-06 19:59:31 +0000 |
| commit | 7974e145b32f00f52cecbd7962d49e5abeece385 (patch) | |
| tree | d27a534c8f3b28925c2d9f4c746b5ed2525a2da5 /ext/dl/cfunc.c | |
| parent | e5d722768ab53ca15d2d006dea5aac5981731c6b (diff) | |
| download | ruby-7974e145b32f00f52cecbd7962d49e5abeece385.tar.gz ruby-7974e145b32f00f52cecbd7962d49e5abeece385.tar.xz ruby-7974e145b32f00f52cecbd7962d49e5abeece385.zip | |
conformed to the usage of FUNC_CDECL/STDCALL described in [ruby-dev:28970].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/dl/cfunc.c')
| -rw-r--r-- | ext/dl/cfunc.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c index 94816204f..458132b78 100644 --- a/ext/dl/cfunc.c +++ b/ext/dl/cfunc.c @@ -222,20 +222,9 @@ rb_dlcfunc_inspect(VALUE self) return val; } -#if defined(__GNUC__) -# define DECL_FUNC_CDECL(f,ret,args) FUNC_CDECL(ret (*f)(args)) -# define DECL_FUNC_STDCALL(f,ret,args) FUNC_STDCALL(ret (*f)(args)) -/* # define DECL_FUNC(f,ret,args,calltype) ret (*f)(args) */ -#elif defined(_MSC_VER) || defined(__BORLANDC__) -# define DECL_FUNC_CDECL(f,ret,args) ret (__cdecl *f)(args) -# define DECL_FUNC_STDCALL(f,ret,args) ret (__stdcall *f)(args) -#elif defined(__SUNPRO_C) -# define DECL_FUNC(f,ret,args,calltype) ret (*f)(args) -# define DECL_FUNC_CDECL(f,ret,args) ret (*f)(args) -# define DECL_FUNC_STDCALL(f,ret,args) ret (*f)(args) -#else -# error "unsupported compiler." -#endif + +# define DECL_FUNC_CDECL(f,ret,args) ret (FUNC_CDECL(*f))(args) +# define DECL_FUNC_STDCALL(f,ret,args) ret (FUNC_STDCALL(*f))(args) #define CALL_CASE switch( RARRAY(ary)->len ){ \ CASE(0); break; \ |