diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-29 07:59:14 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-29 07:59:14 +0000 |
commit | 7566c49068869c222385ffb26bf91b666b3390b1 (patch) | |
tree | abb203e4d6cf86b42d8e7b9d260abf2daef57e00 /ext | |
parent | f0e73fc9862c8d2c57a89349fb79012b826b8245 (diff) |
ruby/ruby.h: RB_BLOCK_CALL_FUNC_ARGLIST
* include/ruby/ruby.h (RB_BLOCK_CALL_FUNC_ARGLIST): for declaration
argument list of rb_block_call_func.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/-test-/bug-3571/bug.c | 2 | ||||
-rw-r--r-- | ext/dbm/dbm.c | 2 | ||||
-rw-r--r-- | ext/gdbm/gdbm.c | 2 | ||||
-rw-r--r-- | ext/openssl/ossl_asn1.c | 2 | ||||
-rw-r--r-- | ext/openssl/ossl_pkcs7.c | 4 | ||||
-rw-r--r-- | ext/openssl/ossl_ssl.c | 2 | ||||
-rw-r--r-- | ext/openssl/ossl_x509name.c | 2 | ||||
-rw-r--r-- | ext/pathname/pathname.c | 4 | ||||
-rw-r--r-- | ext/racc/cparse/cparse.c | 4 | ||||
-rw-r--r-- | ext/sdbm/init.c | 2 | ||||
-rw-r--r-- | ext/win32ole/win32ole.c | 3 |
11 files changed, 15 insertions, 14 deletions
diff --git a/ext/-test-/bug-3571/bug.c b/ext/-test-/bug-3571/bug.c index 72d6bd1021..87a5df0588 100644 --- a/ext/-test-/bug-3571/bug.c +++ b/ext/-test-/bug-3571/bug.c @@ -1,7 +1,7 @@ #include <ruby.h> static VALUE -bug_i(VALUE i, VALUE arg) +bug_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg)) { rb_notimplement(); return ID2SYM(rb_frame_this_func()); diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c index c77897ece5..1fdbaa0aca 100644 --- a/ext/dbm/dbm.c +++ b/ext/dbm/dbm.c @@ -574,7 +574,7 @@ fdbm_invert(VALUE obj) static VALUE fdbm_store(VALUE,VALUE,VALUE); static VALUE -update_i(VALUE pair, VALUE dbm) +update_i(RB_BLOCK_CALL_FUNC_ARGLIST(pair, dbm)) { Check_Type(pair, T_ARRAY); if (RARRAY_LEN(pair) < 2) { diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c index ff0a6524bf..888f95d91f 100644 --- a/ext/gdbm/gdbm.c +++ b/ext/gdbm/gdbm.c @@ -724,7 +724,7 @@ fgdbm_store(VALUE obj, VALUE keystr, VALUE valstr) } static VALUE -update_i(VALUE pair, VALUE dbm) +update_i(RB_BLOCK_CALL_FUNC_ARGLIST(pair, dbm)) { Check_Type(pair, T_ARRAY); if (RARRAY_LEN(pair) < 2) { diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c index 8aa8422b84..4ac66203b9 100644 --- a/ext/openssl/ossl_asn1.c +++ b/ext/openssl/ossl_asn1.c @@ -733,7 +733,7 @@ ossl_asn1data_initialize(VALUE self, VALUE value, VALUE tag, VALUE tag_class) } static VALUE -join_der_i(VALUE i, VALUE str) +join_der_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, str)) { i = ossl_to_der_if_possible(i); StringValue(i); diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c index b710280c9c..553a580923 100644 --- a/ext/openssl/ossl_pkcs7.c +++ b/ext/openssl/ossl_pkcs7.c @@ -624,7 +624,7 @@ pkcs7_get_crls(VALUE self) } static VALUE -ossl_pkcs7_set_certs_i(VALUE i, VALUE arg) +ossl_pkcs7_set_certs_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg)) { return ossl_pkcs7_add_certificate(arg, i); } @@ -664,7 +664,7 @@ ossl_pkcs7_add_crl(VALUE self, VALUE crl) } static VALUE -ossl_pkcs7_set_crls_i(VALUE i, VALUE arg) +ossl_pkcs7_set_crls_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg)) { return ossl_pkcs7_add_crl(arg, i); } diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 77007ba691..b52614f6f6 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -477,7 +477,7 @@ ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess) } static VALUE -ossl_sslctx_add_extra_chain_cert_i(VALUE i, VALUE arg) +ossl_sslctx_add_extra_chain_cert_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg)) { X509 *x509; SSL_CTX *ctx; diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c index 16a2dfd115..6de79d45e9 100644 --- a/ext/openssl/ossl_x509name.c +++ b/ext/openssl/ossl_x509name.c @@ -92,7 +92,7 @@ static VALUE ossl_x509name_add_entry(int, VALUE*, VALUE); #define rb_aref(obj, key) rb_funcall((obj), id_aref, 1, (key)) static VALUE -ossl_x509name_init_i(VALUE i, VALUE args) +ossl_x509name_init_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args)) { VALUE self = rb_ary_entry(args, 0); VALUE template = rb_ary_entry(args, 1); diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index 8205b3c830..3db97fcf3d 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -968,7 +968,7 @@ path_zero_p(VALUE self) } static VALUE -glob_i(VALUE elt, VALUE klass, int argc, VALUE *argv) +glob_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, klass)) { return rb_yield(rb_class_new_instance(1, &elt, klass)); } @@ -1106,7 +1106,7 @@ path_opendir(VALUE self) } static VALUE -each_entry_i(VALUE elt, VALUE klass, int argc, VALUE *argv) +each_entry_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, klass)) { return rb_yield(rb_class_new_instance(1, &elt, klass)); } diff --git a/ext/racc/cparse/cparse.c b/ext/racc/cparse/cparse.c index 8c16656a28..9bb40e7483 100644 --- a/ext/racc/cparse/cparse.c +++ b/ext/racc/cparse/cparse.c @@ -192,7 +192,7 @@ static VALUE racc_yyparse _((VALUE parser, VALUE lexer, VALUE lexmid, VALUE arg, VALUE sysdebug)); static void call_lexer _((struct cparse_params *v)); -static VALUE lexer_i _((VALUE block_args, VALUE data, VALUE self)); +static VALUE lexer_i _((RB_BLOCK_CALL_FUNC_ARGLIST(block_args, data))); static VALUE assert_array _((VALUE a)); static long assert_integer _((VALUE n)); @@ -282,7 +282,7 @@ call_lexer(struct cparse_params *v) #endif static VALUE -lexer_i(VALUE block_args, VALUE data, VALUE self) +lexer_i(RB_BLOCK_CALL_FUNC_ARGLIST(block_args, data)) { struct cparse_params *v; VALUE tok, val; diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c index 78add53e4f..0f26bb89ed 100644 --- a/ext/sdbm/init.c +++ b/ext/sdbm/init.c @@ -632,7 +632,7 @@ fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr) } static VALUE -update_i(VALUE pair, VALUE dbm) +update_i(RB_BLOCK_CALL_FUNC_ARGLIST(pair, dbm)) { Check_Type(pair, T_ARRAY); if (RARRAY_LEN(pair) < 2) { diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 45bd923057..9254ca48f7 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -3302,8 +3302,9 @@ fole_initialize(int argc, VALUE *argv, VALUE self) } static VALUE -hash2named_arg(VALUE pair, struct oleparam* pOp) +hash2named_arg(RB_BLOCK_CALL_FUNC_ARGLIST(pair, op)) { + struct oleparam* pOp = (struct oleparam *)op; unsigned int index, i; VALUE key, value; index = pOp->dp.cNamedArgs; |