Make ap_register_output_filter a #define

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@315024 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/util_filter.h b/include/util_filter.h
index 0f29aaa5dda41f40eca14e9afcac8f0c501b5188..26a6245df266b03d23f89d14aef0311146e928b5 100644 (file)
--- a/include/util_filter.h
+++ b/include/util_filter.h
@@ -344,15 +344,8 @@ AP_DECLARE(ap_filter_rec_t *) ap_register_input_filter(const char *name,
  *              ::AP_FTYPE_CONNECTION
  * @see ap_add_output_filter()
  */
-AP_DECLARE(ap_filter_rec_t *) ap_register_output_filter(const char *name,
-                                            ap_out_filter_func filter_func,
-                                            ap_init_filter_func filter_init,
-                                            ap_filter_type ftype);
-
-/* For httpd-2.2 I suggest replacing the above with
 #define ap_register_output_filter(name,ffunc,init,ftype) \
              ap_register_output_filter_protocol(name,ffunc,init,ftype,0)
-*/
 
 /**
  * This function is used to register an output filter with the system. 

diff --git a/server/util_filter.c b/server/util_filter.c
index baeaf48d2a22020994742cf9a4a12568700270f7..0b23edc1d5bc25fc89075920fb72a33b1a965f61 100644 (file)
--- a/server/util_filter.c
+++ b/server/util_filter.c
@@ -248,15 +248,6 @@ AP_DECLARE(ap_filter_rec_t *) ap_register_input_filter(const char *name,
                            &registered_input_filters);
 }                                                                    
 
-/* Prepare to make this a #define in 2.2 */
-AP_DECLARE(ap_filter_rec_t *) ap_register_output_filter(const char *name,
-                                           ap_out_filter_func filter_func,
-                                           ap_init_filter_func filter_init,
-                                           ap_filter_type ftype)
-{
-    return ap_register_output_filter_protocol(name, filter_func,
-                                              filter_init, ftype, 0) ;
-}
 AP_DECLARE(ap_filter_rec_t *) ap_register_output_filter_protocol(
                                            const char *name,
                                            ap_out_filter_func filter_func,