httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r1033427 - in /httpd/httpd/trunk: include/http_config.h server/config.c
Date Wed, 10 Nov 2010 12:09:27 GMT
Author: rpluem
Date: Wed Nov 10 12:09:27 2010
New Revision: 1033427

URL: http://svn.apache.org/viewvc?rev=1033427&view=rev
Log:
* Fix parameter name as new is a reserved word in C++ which makes compiling
  of http_config.h with C++ impossible.

PR: 50243

Modified:
    httpd/httpd/trunk/include/http_config.h
    httpd/httpd/trunk/server/config.c

Modified: httpd/httpd/trunk/include/http_config.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_config.h?rev=1033427&r1=1033426&r2=1033427&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_config.h (original)
+++ httpd/httpd/trunk/include/http_config.h Wed Nov 10 12:09:27 2010
@@ -999,11 +999,11 @@ AP_DECLARE(struct ap_logconf *) ap_new_l
 /**
  * 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... */
 /**

Modified: httpd/httpd/trunk/server/config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/config.c?rev=1033427&r1=1033426&r2=1033427&view=diff
==============================================================================
--- httpd/httpd/trunk/server/config.c (original)
+++ httpd/httpd/trunk/server/config.c Wed Nov 10 12:09:27 2010
@@ -2092,25 +2092,25 @@ AP_DECLARE(struct ap_logconf *) ap_new_l
     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];
         }
     }
 }



Mime
View raw message