diff options
Diffstat (limited to 'subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h')
-rw-r--r-- | subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h | 72 |
1 files changed, 34 insertions, 38 deletions
diff --git a/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h b/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h index 3eae82e..f6db304 100644 --- a/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h +++ b/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h @@ -59,14 +59,14 @@ extern "C" { #endif +typedef apr_pool_t *(*svn_swig_pl_get_current_pool_func_t)(void); +typedef void (*svn_swig_pl_set_current_pool_func_t)(apr_pool_t *pool); -#if defined(SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK) -typedef apr_pool_t *(*svn_swig_pl_get_current_pool_t)(void); -typedef void (*svn_swig_pl_set_current_pool_t)(apr_pool_t *pool); +void svn_swig_pl__bind_current_pool_fns(svn_swig_pl_get_current_pool_func_t get, + svn_swig_pl_set_current_pool_func_t set); -void svn_swig_pl_bind_current_pool_fns(svn_swig_pl_get_current_pool_t get, - svn_swig_pl_set_current_pool_t set); -#endif +apr_pool_t * svn_swig_pl_get_current_pool(); +void svn_swig_pl_set_current_pool(apr_pool_t *pool); apr_pool_t *svn_swig_pl_make_pool(SV *obj); @@ -83,9 +83,7 @@ svn_error_t *svn_swig_pl_callback_thunk(perl_func_invoker_t caller_func, SV *svn_swig_pl_prophash_to_hash(apr_hash_t *hash); SV *svn_swig_pl_convert_hash(apr_hash_t *hash, swig_type_info *tinfo); -SV *svn_swig_pl_convert_hash_of_revnum_t(apr_hash_t *hash); - -const apr_array_header_t *svn_swig_pl_strings_to_array(SV *source, +apr_array_header_t *svn_swig_pl_strings_to_array(SV *source, apr_pool_t *pool); apr_hash_t *svn_swig_pl_strings_to_hash(SV *source, @@ -98,24 +96,22 @@ apr_hash_t *svn_swig_pl_objs_to_hash_by_name(SV *source, apr_hash_t *svn_swig_pl_objs_to_hash_of_revnum_t(SV *source, apr_pool_t *pool); apr_hash_t *svn_swig_pl_hash_to_prophash(SV *source, apr_pool_t *pool); -const apr_array_header_t *svn_swig_pl_objs_to_array(SV *source, +apr_array_header_t *svn_swig_pl_objs_to_array(SV *source, swig_type_info *tinfo, apr_pool_t *pool); -const apr_array_header_t *svn_swig_pl_array_to_apr_array_revision_range( +apr_array_header_t *svn_swig_pl_array_to_apr_array_revision_range( SV *source, apr_pool_t *pool); SV *svn_swig_pl_array_to_list(const apr_array_header_t *array); -/* Formerly used by pre-1.0 APIs. Now unused -SV *svn_swig_pl_ints_to_list(const apr_array_header_t *array); -*/ SV *svn_swig_pl_convert_array(const apr_array_header_t *array, swig_type_info *tinfo); SV *svn_swig_pl_revnums_to_list(const apr_array_header_t *array); -svn_opt_revision_t *svn_swig_pl_set_revision(svn_opt_revision_t *rev, +svn_opt_revision_t *svn_swig_pl_set_revision(svn_opt_revision_t *rev, SV *source, - svn_boolean_t croak_on_error); + svn_boolean_t croak_on_error, + apr_pool_t *pool); /* thunked log_message receiver function. */ svn_error_t * svn_swig_pl_thunk_log_receiver(void *baton, @@ -139,9 +135,9 @@ svn_error_t * svn_swig_pl_thunk_client_diff_summarize_func( /* thunked commit editor callback. */ svn_error_t *svn_swig_pl_thunk_commit_callback(svn_revnum_t new_revision, - const char *date, - const char *author, - void *baton); + const char *date, + const char *author, + void *baton); /* thunked commit editor callback2. */ svn_error_t *svn_swig_pl_thunk_commit_callback2(const svn_commit_info_t *commit_info, @@ -162,10 +158,10 @@ svn_error_t *svn_swig_pl_thunk_authz_func(svn_boolean_t *allowed, apr_pool_t *pool); /* ra callbacks. */ -svn_error_t *svn_ra_make_callbacks(svn_ra_callbacks_t **cb, - void **c_baton, - SV *perl_callbacks, - apr_pool_t *pool); +svn_error_t *svn_swig_pl_make_callbacks(svn_ra_callbacks_t **cb, + void **c_baton, + SV *perl_callbacks, + apr_pool_t *pool); /* thunked gnome_keyring_unlock_prompt callback function */ svn_error_t *svn_swig_pl_thunk_gnome_keyring_unlock_prompt(char **keyring_password, @@ -223,12 +219,12 @@ svn_error_t *thunk_get_wc_prop(void *baton, /* Thunked version of svn_wc_notify_func_t callback type */ void svn_swig_pl_notify_func(void * baton, const char *path, - svn_wc_notify_action_t action, - svn_node_kind_t kind, - const char *mime_type, - svn_wc_notify_state_t content_state, - svn_wc_notify_state_t prop_state, - svn_revnum_t revision); + svn_wc_notify_action_t action, + svn_node_kind_t kind, + const char *mime_type, + svn_wc_notify_state_t content_state, + svn_wc_notify_state_t prop_state, + svn_revnum_t revision); /* Thunked version of svn_client_get_commit_log3_t callback type. */ @@ -277,15 +273,15 @@ svn_error_t *svn_swig_pl_blame_func(void *baton, svn_boolean_t svn_swig_pl_thunk_config_enumerator(const char *name, const char *value, void *baton); /* helper for making the editor */ -void svn_delta_make_editor(svn_delta_editor_t **editor, - void **edit_baton, - SV *perl_editor, - apr_pool_t *pool); - -void svn_delta_wrap_window_handler(svn_txdelta_window_handler_t *handler, - void **h_baton, - SV *callback, - apr_pool_t *pool); +void svn_swig_pl_make_editor(svn_delta_editor_t **editor, + void **edit_baton, + SV *perl_editor, + apr_pool_t *pool); + +void svn_swig_pl_wrap_window_handler(svn_txdelta_window_handler_t *handler, + void **h_baton, + SV *callback, + apr_pool_t *pool); /* svn_stream_t helpers */ svn_error_t *svn_swig_pl_make_stream(svn_stream_t **stream, SV *obj); |