diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-01 10:02:06 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-01 10:02:06 +0000 |
commit | 3465e37e63242c62c8a86cff16ba156fedf4a202 (patch) | |
tree | 5a9d85b38b895d296fd5594855d1446574bf8f9e /ext/dl/dl.h | |
parent | 0fee78a198acd9dc95ec138a083a13c361dd8bb5 (diff) | |
download | ruby-3465e37e63242c62c8a86cff16ba156fedf4a202.tar.gz |
* ext/dl/cfunc.c (rb_dlcfunc_call): fix for stdcall and missing
argument numbers. [ruby-core:22601]
* ext/dl/dl.h (DLSTACK_PROTO0_): added.
* ext/dl/mkcallback.rb (gencallback, gen_callback_file),
(rb_dl_init_callbacks): omit stdcall functions unless supported.
* lib/rubygems/config_file.rb (SHGetFolderPath): stdcall.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/dl/dl.h')
-rw-r--r-- | ext/dl/dl.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/dl/dl.h b/ext/dl/dl.h index 87a59946cd..753bd1c976 100644 --- a/ext/dl/dl.h +++ b/ext/dl/dl.h @@ -6,9 +6,6 @@ #if !defined(FUNC_CDECL) # define FUNC_CDECL(x) x #endif -#if !defined(FUNC_STDCALL) -# define FUNC_STDCALL(x) x -#endif #if defined(HAVE_DLFCN_H) # include <dlfcn.h> @@ -49,7 +46,7 @@ stack[10],stack[11],stack[12],stack[13],stack[14],\ stack[15],stack[16],stack[17],stack[18],stack[19] -#define DLSTACK_PROTO0 +#define DLSTACK_PROTO0_ void #define DLSTACK_PROTO1_ DLSTACK_TYPE #define DLSTACK_PROTO2_ DLSTACK_PROTO1_, DLSTACK_TYPE #define DLSTACK_PROTO3_ DLSTACK_PROTO2_, DLSTACK_TYPE @@ -86,6 +83,7 @@ * (...) in the declaration) %al is used as hidden argument to * specify the number of SSE registers used. */ +#define DLSTACK_PROTO0 void #define DLSTACK_PROTO1 DLSTACK_PROTO1_, ... #define DLSTACK_PROTO2 DLSTACK_PROTO2_, ... #define DLSTACK_PROTO3 DLSTACK_PROTO3_, ... |