Index: subversion/bindings/swig/swigutil_pl.c =================================================================== --- subversion/bindings/swig/swigutil_pl.c (revision 7999) +++ subversion/bindings/swig/swigutil_pl.c (working copy) @@ -382,7 +382,7 @@ item_baton *ib = edit_baton; SVN_ERR (perl_callback_thunk (CALL_METHOD, - "set_target_revision", NULL, + (void *)"set_target_revision", NULL, "Oi", ib->editor, target_revision)); return SVN_NO_ERROR; @@ -398,7 +398,7 @@ SV *result; SVN_ERR (perl_callback_thunk (CALL_METHOD, - "open_root", &result, + (void *)"open_root", &result, "OiS", ib->editor, base_revision, dir_pool, poolinfo)); @@ -415,7 +415,7 @@ swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *"); SVN_ERR (perl_callback_thunk (CALL_METHOD, - "delete_entry", NULL, + (void *)"delete_entry", NULL, "OsiOS", ib->editor, path, revision, ib->baton, pool, poolinfo)); return SVN_NO_ERROR; @@ -433,7 +433,7 @@ SV *result; SVN_ERR (perl_callback_thunk (CALL_METHOD, - "add_directory", &result, + (void *)"add_directory", &result, "OsOsiS", ib->editor, path, ib->baton, copyfrom_path, copyfrom_revision, dir_pool, poolinfo)); @@ -452,7 +452,7 @@ swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *"); SVN_ERR (perl_callback_thunk (CALL_METHOD, - "open_directory", &result, + (void *)"open_directory", &result, "OsOiS", ib->editor, path, ib->baton, base_revision, dir_pool, poolinfo)); @@ -470,7 +470,7 @@ swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *"); SVN_ERR (perl_callback_thunk (CALL_METHOD, - "change_dir_prop", NULL, + (void *)"change_dir_prop", NULL, "OOssS", ib->editor, ib->baton, name, value ? value->data : NULL, pool, poolinfo)); @@ -492,7 +492,7 @@ swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *"); SVN_ERR (perl_callback_thunk (CALL_METHOD, - "absent_directory", NULL, + (void *)"absent_directory", NULL, "OsOS", ib->editor, path, ib->baton, pool, poolinfo)); @@ -511,7 +511,7 @@ swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *"); SVN_ERR (perl_callback_thunk (CALL_METHOD, - "add_file", &result, + (void *)"add_file", &result, "OsOsiS", ib->editor, path, ib->baton, copyfrom_path, copyfrom_revision, file_pool, poolinfo)); @@ -531,7 +531,7 @@ SV *result; SVN_ERR (perl_callback_thunk (CALL_METHOD, - "open_file", &result, + (void *)"open_file", &result, "OsOiS", ib->editor, path, ib->baton, base_revision, file_pool, poolinfo)); @@ -570,7 +570,7 @@ SV *result; SVN_ERR (perl_callback_thunk (CALL_METHOD, - "apply_textdelta", &result, + (void *)"apply_textdelta", &result, "OOsS", ib->editor, ib->baton, base_checksum, pool, poolinfo)); if (SvOK(result)) { @@ -609,7 +609,7 @@ swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *"); SVN_ERR (perl_callback_thunk (CALL_METHOD, - "change_file_prop", NULL, + (void *)"change_file_prop", NULL, "OOssS", ib->editor, ib->baton, name, value ? value->data : NULL, pool, poolinfo)); @@ -625,7 +625,7 @@ swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *"); SVN_ERR (perl_callback_thunk (CALL_METHOD, - "close_file", NULL, "OOsS", + (void *)"close_file", NULL, "OOsS", ib->editor, ib->baton, text_checksum, pool, poolinfo)); @@ -647,7 +647,7 @@ swig_type_info *poolinfo = SWIG_TypeQuery("apr_pool_t *"); SVN_ERR (perl_callback_thunk (CALL_METHOD, - "absent_file", NULL, + (void *)"absent_file", NULL, "OsOS", ib->editor, path, ib->baton, pool, poolinfo)); @@ -782,7 +782,7 @@ SV *result; swig_type_info *tinfo = SWIG_TypeQuery("apr_file_t *"); - perl_callback_thunk (CALL_METHOD, "open_tmp_file", + perl_callback_thunk (CALL_METHOD, (void *)"open_tmp_file", &result, "O", callback_baton); if (SWIG_ConvertPtr(result, (void *)fp, tinfo,0) < 0) { @@ -801,7 +801,7 @@ SV *result; swig_type_info *tinfo = SWIG_TypeQuery("apr_pool_t *"); - perl_callback_thunk (CALL_METHOD, "get_wc_prop", + perl_callback_thunk (CALL_METHOD, (void *)"get_wc_prop", &result, "OssS", baton, relpath, name, pool, tinfo); /* this is svn_string_t * typemap in */ @@ -864,7 +864,7 @@ } if (!current_pool) - perl_callback_thunk (CALL_METHOD, "new_default", + perl_callback_thunk (CALL_METHOD, (void *)"new_default", &obj, "s", "SVN::Pool"); pool = current_pool; @@ -889,7 +889,7 @@ if (mg = SvTIED_mg((SV*)io->io, PERL_MAGIC_tiedscalar)) { SV *ret; SV *buf = sv_newmortal(); - perl_callback_thunk (CALL_METHOD, "READ", &ret, "OOi", + perl_callback_thunk (CALL_METHOD, (void *)"READ", &ret, "OOi", SvTIED_obj((SV*)io->io, mg), buf, *len); *len = SvIV (ret); @@ -910,7 +910,7 @@ if (mg = SvTIED_mg((SV*)io->io, PERL_MAGIC_tiedscalar)) { SV *ret, *pv; pv = sv_2mortal (newSVpvn (data, *len)); - perl_callback_thunk (CALL_METHOD, "WRITE", &ret, "OOi", + perl_callback_thunk (CALL_METHOD, (void *)"WRITE", &ret, "OOi", SvTIED_obj((SV*)io->io, mg), pv, *len); *len = SvIV (ret); } @@ -925,7 +925,7 @@ MAGIC *mg; if (mg = SvTIED_mg((SV*)io->io, PERL_MAGIC_tiedscalar)) { - perl_callback_thunk (CALL_METHOD, "CLOSE", NULL, "O", + perl_callback_thunk (CALL_METHOD, (void *)"CLOSE", NULL, "O", SvTIED_obj((SV*)io->io, mg)); } else { @@ -949,7 +949,8 @@ if (obj && sv_isobject(obj)) { if (sv_derived_from (obj, "SVN::Stream")) - perl_callback_thunk (CALL_METHOD, "svn_stream", &obj, "O", obj); + perl_callback_thunk (CALL_METHOD, (void *)"svn_stream", + &obj, "O", obj); else if (!sv_derived_from(obj, "_p_svn_stream_t")) simple_type = 0; @@ -983,7 +984,7 @@ swig_type_info *tinfo = SWIG_TypeQuery("svn_stream_t *"); SV *ret; - perl_callback_thunk (CALL_METHOD, "new", &ret, "sS", + perl_callback_thunk (CALL_METHOD, (void *)"new", &ret, "sS", "SVN::Stream", stream, tinfo); return sv_2mortal (ret);