You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2012/04/18 23:27:36 UTC
svn commit: r1327689 - /httpd/httpd/trunk/include/http_log.h
Author: sf
Date: Wed Apr 18 21:27:36 2012
New Revision: 1327689
URL: http://svn.apache.org/viewvc?rev=1327689&view=rev
Log:
For a local variable in a macro, use a name that is less likely to clash
with other variable names.
Modified:
httpd/httpd/trunk/include/http_log.h
Modified: httpd/httpd/trunk/include/http_log.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_log.h?rev=1327689&r1=1327688&r2=1327689&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_log.h (original)
+++ httpd/httpd/trunk/include/http_log.h Wed Apr 18 21:27:36 2012
@@ -363,8 +363,8 @@ AP_DECLARE(void) ap_log_error(const char
#define ap_log_error(...) ap_log_error__(__VA_ARGS__)
/* need server_rec *sr = ... for the case if s is verbatim NULL */
#define ap_log_error__(file, line, mi, level, status, s, ...) \
- do { const server_rec *sr = s; if (APLOG_MODULE_IS_LEVEL(sr, mi, level)) \
- ap_log_error_(file, line, mi, level, status, sr, __VA_ARGS__); \
+ do { const server_rec *sr__ = s; if (APLOG_MODULE_IS_LEVEL(sr__, mi, level)) \
+ ap_log_error_(file, line, mi, level, status, sr__, __VA_ARGS__); \
} while(0)
#else
#define ap_log_error ap_log_error_