httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Greg Stein <gst...@lyra.org>
Subject Re: cvs commit: httpd-2.0/server config.c
Date Fri, 11 May 2001 21:42:18 GMT
Why are some AP_CORE_DECLARE and others AP_DECLARE? That doesn't make sense.

Cheers,
-g

On Fri, May 11, 2001 at 06:37:56PM -0000, orlikowski@apache.org wrote:
> orlikowski    01/05/11 11:37:53
> 
>   Modified:    server   config.c
>   Log:
>   More changes based on Ian's patch.
>   
>   Revision  Changes    Path
>   1.128     +8 -6      httpd-2.0/server/config.c
>   
>   Index: config.c
>   ===================================================================
>   RCS file: /home/cvs/httpd-2.0/server/config.c,v
>   retrieving revision 1.127
>   retrieving revision 1.128
>   diff -u -r1.127 -r1.128
>   --- config.c	2001/05/11 04:35:39	1.127
>   +++ config.c	2001/05/11 18:37:41	1.128
>   @@ -193,7 +193,7 @@
>        return (ap_conf_vector_t *) conf_vector;
>    }
>    
>   -ap_conf_vector_t *ap_merge_per_dir_configs(apr_pool_t *p,
>   +AP_CORE_DECLARE(ap_conf_vector_t*) ap_merge_per_dir_configs(apr_pool_t *p,
>                                               ap_conf_vector_t *base,
>                                               ap_conf_vector_t *new_conf)
>    {
>   @@ -256,7 +256,7 @@
>        return create_empty_config(p);
>    }
>    
>   -ap_conf_vector_t *ap_create_conn_config(apr_pool_t *p)
>   +AP_CORE_DECLARE(ap_conf_vector_t*) ap_create_conn_config(apr_pool_t *p)
>    {
>        return create_empty_config(p);
>    }
>   @@ -266,7 +266,7 @@
>        return create_empty_config(p);
>    }
>    
>   -int ap_invoke_handler(request_rec *r)
>   +AP_CORE_DECLARE(int) ap_invoke_handler(request_rec *r)
>    {
>        const char *handler;
>        const char *p;
>   @@ -891,7 +891,8 @@
>        return NULL;
>    }
>    
>   -const char *ap_build_cont_config(apr_pool_t *p, apr_pool_t *temp_pool,
>   +AP_DECLARE(const char *) ap_build_cont_config(apr_pool_t *p, 
>   +                                 apr_pool_t *temp_pool,
>    				 cmd_parms *parms,
>    				 ap_directive_t **current,
>    				 ap_directive_t **curr_parent,
>   @@ -1281,7 +1282,7 @@
>        return strcmp(f1->fname,f2->fname);
>    }
>    
>   -void ap_process_resource_config(server_rec *s, const char *fname, 
>   +AP_DECLARE(void) ap_process_resource_config(server_rec *s, const char *fname, 
>                                    ap_directive_t **conftree, apr_pool_t *p, 
>                                    apr_pool_t *ptemp)
>    {
>   @@ -1412,7 +1413,8 @@
>        }
>    }
>    
>   -int ap_parse_htaccess(ap_conf_vector_t **result, request_rec *r, int override,
>   +AP_CORE_DECLARE(int) ap_parse_htaccess(ap_conf_vector_t **result, 
>   +                      request_rec *r, int override,
>    		      const char *d, const char *access_name)
>    {
>        ap_configfile_t *f = NULL;
>   
>   
>   

-- 
Greg Stein, http://www.lyra.org/

Mime
View raw message