Merge r1706942 from trunk:

fix parameter name in ap_log_rdata C99 macro def.
Via  PR57045

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706984 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 7a46e97b7ef15fe169dd58a4692436740434d74a..5af588fd4999687771a70f37abe357159715e845 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -110,10 +110,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * core: Fix C99 macro for ap_log_rdata, see comment #8 in PR57045
-     trunk patch: http://svn.apache.org/r1706942
-     2.4.x patch: trunk works
-     +1 covener, trawick, ylavic
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

diff --git a/include/http_log.h b/include/http_log.h
index 77f3ef1316ec350ed839039f846e44691733f053..801dccebb1957dfdba0503a76d3c69d86514daa4 100644 (file)
--- a/include/http_log.h
+++ b/include/http_log.h
@@ -634,7 +634,7 @@ AP_DECLARE(void) ap_log_rdata(const char *file, int line, int module_index,
 #ifdef AP_HAVE_C99
 /* need additional step to expand APLOG_MARK first */
 #define ap_log_rdata(...) ap_log_rdata__(__VA_ARGS__)
-#define ap_log_rdata__(file, line, mi, level, s, ...)           \
+#define ap_log_rdata__(file, line, mi, level, r, ...)           \
     do { if (APLOG_R_MODULE_IS_LEVEL(r, mi, level)) \
              ap_log_rdata_(file, line, mi, level, r, __VA_ARGS__);    \
     } while(0)