From: Eric Covener Date: Tue, 6 Oct 2015 01:37:54 +0000 (+0000) Subject: fix parameter name in ap_log_rdata C99 macro def. X-Git-Tag: 2.5.0-alpha~2760 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6e113cc6fee4f0e7c1d5e5d5f47943befc04296;p=thirdparty%2Fapache%2Fhttpd.git fix parameter name in ap_log_rdata C99 macro def. Via PR57045 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706942 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/include/http_log.h b/include/http_log.h index e82389becec..29a60359a92 100644 --- 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)