* Fix parameter name as new is a reserved word in C++ which makes compiling

  of http_config.h with C++ impossible.

PR: 50243

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

diff --git a/include/http_config.h b/include/http_config.h
index a2f647061350e37dcc4cdb7d5a8ad8706f0c2a90..47a90cc546ccb1c5090c978c396da7fa6f750ed3 100644 (file)
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -999,11 +999,11 @@ AP_DECLARE(struct ap_logconf *) ap_new_log_config(apr_pool_t *p,
 /**
  * Merge old ap_logconf into new ap_logconf.
  * old and new must have the same life time.
- * @param old The ap_logconf to merge from
- * @param new The ap_logconf to merge into
+ * @param old_conf The ap_logconf to merge from
+ * @param new_conf The ap_logconf to merge into
  */
-AP_DECLARE(void) ap_merge_log_config(const struct ap_logconf *old,
-                                     struct ap_logconf *new);
+AP_DECLARE(void) ap_merge_log_config(const struct ap_logconf *old_conf,
+                                     struct ap_logconf *new_conf);
 
 /* For http_connection.c... */
 /**

diff --git a/server/config.c b/server/config.c
index 7c01b5b2577fff4ac6829537a76f208ffa47271f..dbbbaca3798300d05e34e73c3044d45638949533 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -2092,25 +2092,25 @@ AP_DECLARE(struct ap_logconf *) ap_new_log_config(apr_pool_t *p,
     return l;
 }
 
-AP_DECLARE(void) ap_merge_log_config(const struct ap_logconf *old,
-                                     struct ap_logconf *new)
+AP_DECLARE(void) ap_merge_log_config(const struct ap_logconf *old_conf,
+                                     struct ap_logconf *new_conf)
 {
-    if (new->level != APLOG_UNSET) {
+    if (new_conf->level != APLOG_UNSET) {
         /* Setting the main loglevel resets all per-module log levels.
          * I.e. if new->level has been set, we must ignore old->module_levels.
          */
         return;
     }
 
-    new->level = old->level;
-    if (new->module_levels == NULL) {
-        new->module_levels = old->module_levels;
+    new_conf->level = old_conf->level;
+    if (new_conf->module_levels == NULL) {
+        new_conf->module_levels = old_conf->module_levels;
     }
-    else if (old->module_levels != NULL) {
+    else if (old_conf->module_levels != NULL) {
         int i;
         for (i = 0; i < conf_vector_length; i++) {
-            if (new->module_levels[i] == APLOG_UNSET)
-                new->module_levels[i] = old->module_levels[i];
+            if (new_conf->module_levels[i] == APLOG_UNSET)
+                new_conf->module_levels[i] = old_conf->module_levels[i];
         }
     }
 }