Commit 1396e02e authored by Doug MacEachern's avatar Doug MacEachern
Browse files

avoid c++ keywords 


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

include/http_config.h

+2 −2
Original line number Diff line number Diff line
@@ -845,11 +845,11 @@ AP_CORE_DECLARE(ap_conf_vector_t *) ap_create_per_dir_config(apr_pool_t *p); 
 * Run all of the modules merge per dir config functions

 * @param p The pool to pass to the merge functions

 * @param base The base directory config structure

 * @param new The new directory config structure

 * @param new_conf The new directory config structure

 */

ap_conf_vector_t *ap_merge_per_dir_configs(apr_pool_t *p,

                                           ap_conf_vector_t *base,

                                           ap_conf_vector_t *new);

                                           ap_conf_vector_t *new_conf);



/* For http_connection.c... */

/**

server/config.c

+2 −2
Original line number Diff line number Diff line
@@ -191,11 +191,11 @@ static ap_conf_vector_t *create_default_per_dir_config(apr_pool_t *p) 


ap_conf_vector_t *ap_merge_per_dir_configs(apr_pool_t *p,

                                           ap_conf_vector_t *base,

                                           ap_conf_vector_t *new)

                                           ap_conf_vector_t *new_conf)

{

    void **conf_vector = apr_palloc(p, sizeof(void *) * total_modules);

    void **base_vector = (void **) base;

    void **new_vector = (void **) new;

    void **new_vector = (void **) new_conf;

    module *modp;



    for (modp = top_module; modp; modp = modp->next) {