From: William A. Rowe Jr Date: Tue, 10 Apr 2001 16:26:21 +0000 (+0000) Subject: We seem to use fn_t *fn throughout the rest of apache, so normalize this X-Git-Tag: 2.0.17~74 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3efd6fa64e209d9f204d7dbecc70187f3de55a6;p=thirdparty%2Fapache%2Fhttpd.git We seem to use fn_t *fn throughout the rest of apache, so normalize this syntax for mod_include's include_handler(_t) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88782 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c index 4cdf5035a34..7e2e182d62c 100644 --- a/modules/filters/mod_include.c +++ b/modules/filters/mod_include.c @@ -2790,7 +2790,7 @@ static int includes_filter(ap_filter_t *f, apr_bucket_brigade *b) return OK; } -static void ap_register_include_handler(char *tag, include_handler func) +static void ap_register_include_handler(char *tag, include_handler *func) { apr_hash_set(include_hash, tag, strlen(tag) + 1, (const void *)func); } diff --git a/modules/filters/mod_include.h b/modules/filters/mod_include.h index 48e766fd925..8a4e4b62cc5 100644 --- a/modules/filters/mod_include.h +++ b/modules/filters/mod_include.h @@ -195,7 +195,7 @@ if ((APR_BRIGADE_EMPTY(cntxt->ssi_tag_brigade)) && \ } -typedef int (*include_handler)(include_ctx_t *ctx, apr_bucket_brigade **bb, +typedef int (include_handler)(include_ctx_t *ctx, apr_bucket_brigade **bb, request_rec *r, ap_filter_t *f, apr_bucket *head_ptr, apr_bucket **inserted_head); @@ -209,6 +209,6 @@ APR_DECLARE_OPTIONAL_FN(void, ap_ssi_parse_string, (request_rec *r, size_t length, int leave_name)); APR_DECLARE_OPTIONAL_FN(void, ap_register_include_handler, (char *tag, - include_handler func)); + include_handler *func)); #endif /* MOD_INCLUDE */